From 87220e501a848881b56f25733fc7ccb56f3dd192 Mon Sep 17 00:00:00 2001 From: NissimHadar Date: Fri, 25 May 2018 15:02:00 -0700 Subject: [PATCH] Don't show tablet in test mode, so that it won't appear in snapshots. Its location is not fixed - this will cause image comparisons to fail) --- interface/src/Application.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 1a009954b5..420306874b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1033,6 +1033,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo if ((i + 2) < args.size() && args.at(i + 2) == TEST_QUIT_WHEN_FINISHED_OPTION) { quitWhenFinished = true; } + } else if (args.at(i) == TEST_RESULTS_LOCATION_COMMAND) { // Set test snapshot location only if it is a writeable directory QString path(args.at(i + 1)); @@ -2265,6 +2266,14 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo qCDebug(interfaceapp) << "Metaverse session ID is" << uuidStringWithoutCurlyBraces(accountManager->getSessionID()); + // Don't show tablet in test mode, so that it won't appear in snapshots + // (its 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) AndroidHelper::instance().init(); connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);