History

bring over some previous tablet-ui work

Seth Alves committed 9 years ago

Commit 369f61e1 parent 401f49f15 files · +322 −53Browse files

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

Unified · Split

interface/src/Application.cpp+6−1
@@ -1018,7 +1018,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1017 unmodified lines
10181018 toggleMenuUnderReticle();
10191019 }
10201020 } else if (action == controller::toInt(controller::Action::CONTEXT_MENU)) {
1021− toggleMenuUnderReticle();
1021+ toggleTabletUI();
10221022 } else if (action == controller::toInt(controller::Action::RETICLE_X)) {
10231023 auto oldPos = getApplicationCompositor().getReticlePosition();
10241024 getApplicationCompositor().setReticlePosition({ oldPos.x + state, oldPos.y });
@@ -1484,6 +1484,11 @@ void Application::toggleMenuUnderReticle() const { · 459 unmodified lines
14841484 offscreenUi->toggleMenu(QPoint(reticlePosition.x - X_LEFT_SHIFT, reticlePosition.y));
14851485 }
14861486
1487+void Application::toggleTabletUI() const {
1488+ auto HMD = DependencyManager::get<HMDScriptingInterface>();
1489+ HMD->toggleShouldShowTablet();
1490+}
1491+
14871492 void Application::checkChangeCursor() {
14881493 QMutexLocker locker(&_changeCursorLock);
14891494 if (_cursorNeedsChanging) {