Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 20:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix mini tablet always displaying if start up in HMD mode

Browse source
This commit is contained in:
David Rowe 2018-11-08 17:47:02 +13:00
parent e5fe2622ae
commit 371919b923
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scripts/system/miniTablet.js
View file

@ -1057,6 +1057,8 @@
function setUp() { function setUp() {
miniState = new State(); miniState = new State();
HMD.miniTabletEnabledChanged.connect(onMiniTabletEnabledChanged);
miniTabletEnabled = HMD.miniTabletEnabled; miniTabletEnabled = HMD.miniTabletEnabled;
Messages.subscribe(HIFI_OBJECT_MANIPULATION_CHANNEL); Messages.subscribe(HIFI_OBJECT_MANIPULATION_CHANNEL);
@ -1064,8 +1066,8 @@
MyAvatar.wentAway.connect(onWentAway); MyAvatar.wentAway.connect(onWentAway);
HMD.displayModeChanged.connect(onDisplayModeChanged); HMD.displayModeChanged.connect(onDisplayModeChanged);
HMD.miniTabletEnabledChanged.connect(onMiniTabletEnabledChanged);
if (HMD.active) { if (HMD.active && miniTabletEnabled) {
miniState.setState(miniState.MINI_HIDDEN); miniState.setState(miniState.MINI_HIDDEN);
} }
} }
@ -1073,13 +1075,14 @@
function tearDown() { function tearDown() {
miniState.setState(miniState.MINI_DISABLED); miniState.setState(miniState.MINI_DISABLED);
HMD.miniTabletEnabledChanged.disconnect(onMiniTabletEnabledChanged);
HMD.displayModeChanged.disconnect(onDisplayModeChanged); HMD.displayModeChanged.disconnect(onDisplayModeChanged);
MyAvatar.wentAway.disconnect(onWentAway); MyAvatar.wentAway.disconnect(onWentAway);
Messages.messageReceived.disconnect(onMessageReceived); Messages.messageReceived.disconnect(onMessageReceived);
Messages.unsubscribe(HIFI_OBJECT_MANIPULATION_CHANNEL); Messages.unsubscribe(HIFI_OBJECT_MANIPULATION_CHANNEL);
HMD.miniTabletEnabledChanged.disconnect(onMiniTabletEnabledChanged);
miniState.destroy(); miniState.destroy();
miniState = null; miniState = null;
} }