Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix snapshot settings

Browse source
This commit is contained in:
Dante Ruiz 2018-09-14 12:59:28 -07:00
parent 4378f5bf1c
commit 4eb5c9714b
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml
View file

@ -41,11 +41,7 @@ Item {
section.saveAll();
}
if (HMD.active) {
tablet.popFromStack();
} else {
closeDialog();
}
closeDialog();
}
function restoreAll() {
@ -54,11 +50,7 @@ Item {
section.restoreAll();
}
if (HMD.active) {
tablet.popFromStack();
} else {
closeDialog();
}
closeDialog();
}
function closeDialog() {

2
interface/src/Menu.cpp
View file

@ -255,7 +255,7 @@ Menu::Menu() {
connect(action, &QAction::triggered, [] {
auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
auto hmd = DependencyManager::get<HMDScriptingInterface>();
tablet->pushOntoStack("hifi/tablet/ControllerSettings.qml");
tablet->loadQMLOnTop("hifi/tablet/ControllerSettings.qml");
if (!hmd->getShouldShowTablet()) {
hmd->toggleShouldShowTablet();