Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -2427,10 +2427,6 @@ void Application::initializeUi() { · 2426 unmodified lines | |||
| 2427 | } | 2427 | } |
| 2428 | 2428 | ||
| 2429 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); | 2429 | auto offscreenUi = DependencyManager::get<OffscreenUi>(); |
| 2430 | DeadlockWatchdogThread::withPause([&] { | ||
| 2431 | offscreenUi->create(); | ||
| 2432 | }); | ||
| 2433 | |||
| 2434 | connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootContextCreated, | 2430 | connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootContextCreated, |
| 2435 | this, &Application::onDesktopRootContextCreated); | 2431 | this, &Application::onDesktopRootContextCreated); |
| 2436 | connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootItemCreated, | 2432 | connect(offscreenUi.data(), &hifi::qml::OffscreenSurface::rootItemCreated, |
| @@ -2439,7 +2435,9 @@ void Application::initializeUi() { · 2 unmodified lines | |||
| 2439 | offscreenUi->setProxyWindow(_window->windowHandle()); | 2435 | offscreenUi->setProxyWindow(_window->windowHandle()); |
| 2440 | // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to | 2436 | // OffscreenUi is a subclass of OffscreenQmlSurface specifically designed to |
| 2441 | // support the window management and scripting proxies for VR use | 2437 | // support the window management and scripting proxies for VR use |
| 2442 | offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml")); | 2438 | DeadlockWatchdogThread::withPause([&] { |
| 2439 | offscreenUi->createDesktop(PathUtils::qmlUrl("hifi/Desktop.qml")); | ||
| 2440 | }); | ||
| 2443 | // FIXME either expose so that dialogs can set this themselves or | 2441 | // FIXME either expose so that dialogs can set this themselves or |
| 2444 | // do better detection in the offscreen UI of what has focus | 2442 | // do better detection in the offscreen UI of what has focus |
| 2445 | offscreenUi->setNavigationFocused(false); | 2443 | offscreenUi->setNavigationFocused(false); |