Merge pull request #13886 from ctrlaltdavid/M17901

Improve HMD Menu page navigation

Seth Alves committed 8 years ago

Commit cb332222 parents 3b0f37c ab47e168 files · +36 −32Browse files

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

Unified · Split

interface/src/Menu.cpp+1−1

@@ -255,7 +255,7 @@ Menu::Menu() { · 254 unmodified lines
255	connect(action, &QAction::triggered, [] {	255	connect(action, &QAction::triggered, [] {
256	auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");	256	auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
257	auto hmd = DependencyManager::get<HMDScriptingInterface>();	257	auto hmd = DependencyManager::get<HMDScriptingInterface>();
258	tablet->loadQMLSource("hifi/tablet/ControllerSettings.qml");	258	tablet->pushOntoStack("hifi/tablet/ControllerSettings.qml");
259		259
260	if (!hmd->getShouldShowTablet()) {	260	if (!hmd->getShouldShowTablet()) {
261	hmd->toggleShouldShowTablet();	261	hmd->toggleShouldShowTablet();