Showing the changes to interface/src/Application.cpp (1 of 15 files). Show all
Unified · Split
| @@ -1018,7 +1018,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1017 unmodified lines | |||
| 1018 | toggleMenuUnderReticle(); | 1018 | toggleMenuUnderReticle(); |
| 1019 | } | 1019 | } |
| 1020 | } else if (action == controller::toInt(controller::Action::CONTEXT_MENU)) { | 1020 | } else if (action == controller::toInt(controller::Action::CONTEXT_MENU)) { |
| 1021 | toggleMenuUnderReticle(); | 1021 | toggleTabletUI(); |
| 1022 | } else if (action == controller::toInt(controller::Action::RETICLE_X)) { | 1022 | } else if (action == controller::toInt(controller::Action::RETICLE_X)) { |
| 1023 | auto oldPos = getApplicationCompositor().getReticlePosition(); | 1023 | auto oldPos = getApplicationCompositor().getReticlePosition(); |
| 1024 | getApplicationCompositor().setReticlePosition({ oldPos.x + state, oldPos.y }); | 1024 | getApplicationCompositor().setReticlePosition({ oldPos.x + state, oldPos.y }); |
| @@ -1484,6 +1484,11 @@ void Application::toggleMenuUnderReticle() const { · 459 unmodified lines | |||
| 1484 | offscreenUi->toggleMenu(QPoint(reticlePosition.x - X_LEFT_SHIFT, reticlePosition.y)); | 1484 | offscreenUi->toggleMenu(QPoint(reticlePosition.x - X_LEFT_SHIFT, reticlePosition.y)); |
| 1485 | } | 1485 | } |
| 1486 | 1486 | ||
| 1487 | void Application::toggleTabletUI() const { | ||
| 1488 | auto HMD = DependencyManager::get<HMDScriptingInterface>(); | ||
| 1489 | HMD->toggleShouldShowTablet(); | ||
| 1490 | } | ||
| 1491 | |||
| 1487 | void Application::checkChangeCursor() { | 1492 | void Application::checkChangeCursor() { |
| 1488 | QMutexLocker locker(&_changeCursorLock); | 1493 | QMutexLocker locker(&_changeCursorLock); |
| 1489 | if (_cursorNeedsChanging) { | 1494 | if (_cursorNeedsChanging) { |