Fix menu launch from Oculus remote

Brad Davis committed 10 years ago

Commit 72d89901 parent 2f28c641 file · +5 −0Browse files

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

Unified · Split

interface/src/Application.cpp+5−0

@@ -895,6 +895,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 894 unmodified lines
895	895	DependencyManager::get<AudioClient>()->toggleMute();
896	896	} else if (action == controller::toInt(controller::Action::CYCLE_CAMERA)) {
897	897	cycleCamera();
	898	+ } else if (action == controller::toInt(controller::Action::UI_NAV_SELECT)) {
	899	+ if (!offscreenUi->navigationFocused()) {
	900	+ auto reticlePosition = getApplicationCompositor().getReticlePosition();
	901	+ offscreenUi->toggleMenu(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));
	902	+ }
898	903	} else if (action == controller::toInt(controller::Action::CONTEXT_MENU)) {
899	904	auto reticlePosition = getApplicationCompositor().getReticlePosition();
900	905	offscreenUi->toggleMenu(_glWidget->mapFromGlobal(QPoint(reticlePosition.x, reticlePosition.y)));