Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all
Unified · Split
| @@ -1198,7 +1198,8 @@ void Application::initializeUi() { · 1197 unmodified lines | |||
| 1198 | // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to | 1198 | // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to |
| 1199 | // support the window management and scripting proxies for VR use | 1199 | // support the window management and scripting proxies for VR use |
| 1200 | offscreenUi->createDesktop(QString("hifi/Desktop.qml")); | 1200 | offscreenUi->createDesktop(QString("hifi/Desktop.qml")); |
| 1201 | 1201 | connect(offscreenUi.data(), &OffscreenUi::showDesktop, this, &Application::showDesktop); | |
| 1202 | |||
| 1202 | // FIXME either expose so that dialogs can set this themselves or | 1203 | // FIXME either expose so that dialogs can set this themselves or |
| 1203 | // do better detection in the offscreen UI of what has focus | 1204 | // do better detection in the offscreen UI of what has focus |
| 1204 | offscreenUi->setNavigationFocused(false); | 1205 | offscreenUi->setNavigationFocused(false); |
| @@ -5128,3 +5129,9 @@ void Application::readArgumentsFromLocalSocket() { · 3923 unmodified lines | |||
| 5128 | qApp->openUrl(QString::fromUtf8(message)); | 5129 | qApp->openUrl(QString::fromUtf8(message)); |
| 5129 | } | 5130 | } |
| 5130 | } | 5131 | } |
| 5132 | |||
| 5133 | void Application::showDesktop() { | ||
| 5134 | if (!_overlayConductor.getEnabled()) { | ||
| 5135 | _overlayConductor.setEnabled(true); | ||
| 5136 | } | ||
| 5137 | } | ||