History

allowed tablet to toggle when a dialog is open

Dante Ruiz committed 9 years ago

Commit bedd0621 parent 4a35ad11 file · +1 −1Browse files

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

Unified · Split

interface/src/Application.cpp+1−1
@@ -1706,7 +1706,7 @@ void Application::toggleTabletUI(bool shouldOpen) const { · 1705 unmodified lines
1706 auto hmd = DependencyManager::get<HMDScriptingInterface>();1706 auto hmd = DependencyManager::get<HMDScriptingInterface>();
1707 TabletProxy* tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));1707 TabletProxy* tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet(SYSTEM_TABLET));
1708 bool messageOpen = tablet->isMessageDialogOpen();1708 bool messageOpen = tablet->isMessageDialogOpen();
1709 if ((!messageOpen || (messageOpen && !hmd->getShouldShowTablet())) && !(shouldOpen && hmd->getShouldShowTablet())) {1709 if (!(shouldOpen && hmd->getShouldShowTablet())) {
1710 auto HMD = DependencyManager::get<HMDScriptingInterface>();1710 auto HMD = DependencyManager::get<HMDScriptingInterface>();
1711 HMD->toggleShouldShowTablet();1711 HMD->toggleShouldShowTablet();
1712 }1712 }