History

Auto-unhide the desktop when showing or raising a window

Brad Davis committed 10 years ago

Commit 160a1071 parent 965d6bb5 files · +28 −3Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+8−1
@@ -1198,7 +1198,8 @@ void Application::initializeUi() { · 1197 unmodified lines
11981198 // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to
11991199 // support the window management and scripting proxies for VR use
12001200 offscreenUi->createDesktop(QString("hifi/Desktop.qml"));
1201−
1201+ connect(offscreenUi.data(), &OffscreenUi::showDesktop, this, &Application::showDesktop);
1202+
12021203 // FIXME either expose so that dialogs can set this themselves or
12031204 // do better detection in the offscreen UI of what has focus
12041205 offscreenUi->setNavigationFocused(false);
@@ -5128,3 +5129,9 @@ void Application::readArgumentsFromLocalSocket() { · 3923 unmodified lines
51285129 qApp->openUrl(QString::fromUtf8(message));
51295130 }
51305131 }
5132+
5133+void Application::showDesktop() {
5134+ if (!_overlayConductor.getEnabled()) {
5135+ _overlayConductor.setEnabled(true);
5136+ }
5137+}