Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 11:37:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed "Don't show toolbar in test mode.." as this functionality is available through JS commands.

Browse source
This commit is contained in:
NissimHadar 2018-05-29 11:20:29 -07:00
parent 0af1599b53
commit c49bcbe4e9
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Application.cpp
View file

@ -1033,7 +1033,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
if ((i + 2) < args.size() && args.at(i + 2) == TEST_QUIT_WHEN_FINISHED_OPTION) { if ((i + 2) < args.size() && args.at(i + 2) == TEST_QUIT_WHEN_FINISHED_OPTION) {
quitWhenFinished = true; quitWhenFinished = true;
} }
} else if (args.at(i) == TEST_RESULTS_LOCATION_COMMAND) { } else if (args.at(i) == TEST_RESULTS_LOCATION_COMMAND) {
// Set test snapshot location only if it is a writeable directory // Set test snapshot location only if it is a writeable directory
QString path(args.at(i + 1)); QString path(args.at(i + 1));
@ -2220,6 +2219,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(this, &QCoreApplication::aboutToQuit, this, &Application::addAssetToWorldMessageClose); connect(this, &QCoreApplication::aboutToQuit, this, &Application::addAssetToWorldMessageClose);
connect(&domainHandler, &DomainHandler::domainURLChanged, this, &Application::addAssetToWorldMessageClose); connect(&domainHandler, &DomainHandler::domainURLChanged, this, &Application::addAssetToWorldMessageClose);
updateSystemTabletMode();
connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged); connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged);
DependencyManager::get<PickManager>()->setShouldPickHUDOperator([&]() { return DependencyManager::get<HMDScriptingInterface>()->isHMDMode(); }); DependencyManager::get<PickManager>()->setShouldPickHUDOperator([&]() { return DependencyManager::get<HMDScriptingInterface>()->isHMDMode(); });
@ -2264,14 +2265,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID());
// Don't show toolbar in test mode, so that it won't appear in snapshots
// (its screen location is not fixed - this will cause image comparisons to fail)
if (property(hifi::properties::TEST).isValid()) {
Menu::getInstance()->setIsOptionChecked(MenuOption::DesktopTabletToToolbar, false);
_desktopTabletBecomesToolbarSetting.set(false);
}
updateSystemTabletMode();
#if defined(Q_OS_ANDROID) #if defined(Q_OS_ANDROID)
AndroidHelper::instance().init(); AndroidHelper::instance().init();
connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground); connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);