Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 17:49:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

correct implementation that doesn't interfere with other app status

Browse source
This commit is contained in:
Liv Erickson 2018-04-17 15:27:07 -07:00
parent 071396bed0
commit abe8a3e6d9
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/system/edit.js
View file

@ -452,13 +452,12 @@ var toolBar = (function () {
} }
} }
function clearWindow() {
tablet.gotoHomeScreen();
};
function initialize() { function initialize() {
Script.scriptEnding.connect(cleanup); Script.scriptEnding.connect(cleanup);
Window.domainChanged.connect(function () { Window.domainChanged.connect(function () {
if (isActive) {
tablet.gotoHomeScreen();
}
that.setActive(false); that.setActive(false);
that.clearEntityList(); that.clearEntityList();
}); });
@ -722,8 +721,6 @@ var toolBar = (function () {
cameraManager.disable(); cameraManager.disable();
selectionDisplay.triggerMapping.disable(); selectionDisplay.triggerMapping.disable();
tablet.landscape = false; tablet.landscape = false;
Window.domainChanged.disconnect(clearWindow);
Window.domainConnectionRefused.disconnect(clearWindow);
} else { } else {
tablet.loadQMLSource("hifi/tablet/Edit.qml", true); tablet.loadQMLSource("hifi/tablet/Edit.qml", true);
UserActivityLogger.enabledEdit(); UserActivityLogger.enabledEdit();
@ -735,8 +732,6 @@ var toolBar = (function () {
print("starting tablet in landscape mode"); print("starting tablet in landscape mode");
tablet.landscape = true; tablet.landscape = true;
entityIconOverlayManager.setIconsSelectable(null,false); entityIconOverlayManager.setIconsSelectable(null,false);
Window.domainChanged.connect(clearWindow);
Window.domainConnectionRefused.connect(clearWindow);
// Not sure what the following was meant to accomplish, but it currently causes // Not sure what the following was meant to accomplish, but it currently causes
// everybody else to think that Interface has lost focus overall. fogbugzid:558 // everybody else to think that Interface has lost focus overall. fogbugzid:558
// Window.setFocus(); // Window.setFocus();