Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 06:20:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent tablet from being open while in toolbarMode

Browse source
This commit is contained in:
Anthony J. Thibault 2017-02-16 16:18:51 -08:00
parent 8ccca86dee
commit 7f95753a1e
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/system/tablet-ui/tabletUI.js
View file

@ -52,6 +52,15 @@
} }
function updateShowTablet() { function updateShowTablet() {
// close the WebTablet if it we go into toolbar mode.
var toolbarMode = Tablet.getTablet("com.highfidelity.interface.tablet.system").toolbarMode;
if (tabletShown && toolbarMode) {
hideTabletUI();
HMD.closeTablet();
return;
}
if (tabletShown) { if (tabletShown) {
var MUTE_MICROPHONE_MENU_ITEM = "Mute Microphone"; var MUTE_MICROPHONE_MENU_ITEM = "Mute Microphone";
var currentMicEnabled = !Menu.isOptionChecked(MUTE_MICROPHONE_MENU_ITEM); var currentMicEnabled = !Menu.isOptionChecked(MUTE_MICROPHONE_MENU_ITEM);
@ -67,7 +76,7 @@
// other reason, close the tablet. // other reason, close the tablet.
hideTabletUI(); hideTabletUI();
HMD.closeTablet(); HMD.closeTablet();
} else if (HMD.showTablet && !tabletShown) { } else if (HMD.showTablet && !tabletShown && !toolbarMode) {
UserActivityLogger.openedTablet(); UserActivityLogger.openedTablet();
showTabletUI(); showTabletUI();
} else if (!HMD.showTablet && tabletShown) { } else if (!HMD.showTablet && tabletShown) {