Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -1200,7 +1200,6 @@ void Application::initializeUi() { · 1199 unmodified lines | |||
| 1200 | // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to | 1200 | // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to |
| 1201 | // support the window management and scripting proxies for VR use | 1201 | // support the window management and scripting proxies for VR use |
| 1202 | offscreenUi->createDesktop(QString("hifi/Desktop.qml")); | 1202 | offscreenUi->createDesktop(QString("hifi/Desktop.qml")); |
| 1203 | connect(offscreenUi.data(), &OffscreenUi::showDesktop, this, &Application::showDesktop); | ||
| 1204 | 1203 | ||
| 1205 | // FIXME either expose so that dialogs can set this themselves or | 1204 | // FIXME either expose so that dialogs can set this themselves or |
| 1206 | // do better detection in the offscreen UI of what has focus | 1205 | // do better detection in the offscreen UI of what has focus |
| @@ -2435,6 +2434,17 @@ void Application::idle(uint64_t now) { · 1228 unmodified lines | |||
| 2435 | if (_aboutToQuit) { | 2434 | if (_aboutToQuit) { |
| 2436 | return; // bail early, nothing to do here. | 2435 | return; // bail early, nothing to do here. |
| 2437 | } | 2436 | } |
| 2437 | |||
| 2438 | Stats::getInstance()->updateStats(); | ||
| 2439 | AvatarInputs::getInstance()->update(); | ||
| 2440 | |||
| 2441 | static bool firstIdle = true; | ||
| 2442 | if (firstIdle) { | ||
| 2443 | firstIdle = false; | ||
| 2444 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); | ||
| 2445 | connect(offscreenUi.data(), &OffscreenUi::showDesktop, this, &Application::showDesktop); | ||
| 2446 | } | ||
| 2447 | |||
| 2438 | 2448 | ||
| 2439 | auto displayPlugin = getActiveDisplayPlugin(); | 2449 | auto displayPlugin = getActiveDisplayPlugin(); |
| 2440 | // depending on whether we're throttling or not. | 2450 | // depending on whether we're throttling or not. |
| @@ -2998,6 +3008,10 @@ void Application::toggleOverlays() { · 557 unmodified lines | |||
| 2998 | _overlayConductor.setEnabled(overlaysVisible); | 3008 | _overlayConductor.setEnabled(overlaysVisible); |
| 2999 | } | 3009 | } |
| 3000 | 3010 | ||
| 3011 | void Application::setOverlaysVisible(bool visible) { | ||
| 3012 | _overlayConductor.setEnabled(visible); | ||
| 3013 | } | ||
| 3014 | |||
| 3001 | void Application::cycleCamera() { | 3015 | void Application::cycleCamera() { |
| 3002 | auto menu = Menu::getInstance(); | 3016 | auto menu = Menu::getInstance(); |
| 3003 | if (menu->isOptionChecked(MenuOption::FullscreenMirror)) { | 3017 | if (menu->isOptionChecked(MenuOption::FullscreenMirror)) { |