mirror of
https://github.com/overte-org/overte.git
synced 2025-08-04 10:03:37 +02:00
Prevent PAL from re-enabling ContextOverlayInterface when it's not supposed to
This commit is contained in:
parent
d3c0236602
commit
2fad55e5d0
1 changed files with 6 additions and 2 deletions
|
@ -670,12 +670,13 @@ triggerPressMapping.from(Controller.Standard.RT).peek().to(makePressHandler(Cont
|
||||||
triggerPressMapping.from(Controller.Standard.LT).peek().to(makePressHandler(Controller.Standard.LeftHand));
|
triggerPressMapping.from(Controller.Standard.LT).peek().to(makePressHandler(Controller.Standard.LeftHand));
|
||||||
|
|
||||||
function tabletVisibilityChanged() {
|
function tabletVisibilityChanged() {
|
||||||
if (!tablet.tabletShown) {
|
if (!tablet.tabletShown && onPalScreen) {
|
||||||
ContextOverlay.enabled = true;
|
ContextOverlay.enabled = true;
|
||||||
tablet.gotoHomeScreen();
|
tablet.gotoHomeScreen();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var wasOnPalScreen = false;
|
||||||
var onPalScreen = false;
|
var onPalScreen = false;
|
||||||
var PAL_QML_SOURCE = "hifi/Pal.qml";
|
var PAL_QML_SOURCE = "hifi/Pal.qml";
|
||||||
function onTabletButtonClicked() {
|
function onTabletButtonClicked() {
|
||||||
|
@ -706,6 +707,7 @@ function wireEventBridge(on) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function onTabletScreenChanged(type, url) {
|
function onTabletScreenChanged(type, url) {
|
||||||
|
wasOnPalScreen = onPalScreen;
|
||||||
onPalScreen = (type === "QML" && url === PAL_QML_SOURCE);
|
onPalScreen = (type === "QML" && url === PAL_QML_SOURCE);
|
||||||
wireEventBridge(onPalScreen);
|
wireEventBridge(onPalScreen);
|
||||||
// for toolbar mode: change button to active when window is first openend, false otherwise.
|
// for toolbar mode: change button to active when window is first openend, false otherwise.
|
||||||
|
@ -729,8 +731,10 @@ function onTabletScreenChanged(type, url) {
|
||||||
populateNearbyUserList();
|
populateNearbyUserList();
|
||||||
} else {
|
} else {
|
||||||
off();
|
off();
|
||||||
|
if (wasOnPalScreen) {
|
||||||
ContextOverlay.enabled = true;
|
ContextOverlay.enabled = true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
|
Loading…
Reference in a new issue