Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 11:48:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

- native window presentation mode update

Browse source 
- de-activate create on displayMode change.
This commit is contained in:
Thijs Wenker 2018-07-03 17:26:18 +02:00
parent 3a6ab3562f
commit 7ed03c2f77
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/system/edit.js
View file

@ -545,6 +545,13 @@ var toolBar = (function () {
checkEditPermissionsAndUpdate(); checkEditPermissionsAndUpdate();
}); });
HMD.displayModeChanged.connect(function () {
if (isActive) {
tablet.gotoHomeScreen();
}
that.setActive(false);
});
Entities.canAdjustLocksChanged.connect(function (canAdjustLocks) { Entities.canAdjustLocksChanged.connect(function (canAdjustLocks) {
if (isActive && !canAdjustLocks) { if (isActive && !canAdjustLocks) {
that.setActive(false); that.setActive(false);
@ -606,7 +613,8 @@ var toolBar = (function () {
closeExistingDialogWindow(); closeExistingDialogWindow();
dialogWindow = Desktop.createWindow("qml/hifi/tablet/New" + entityType + "Window.qml", { dialogWindow = Desktop.createWindow("qml/hifi/tablet/New" + entityType + "Window.qml", {
title: "New " + entityType + " Entity", title: "New " + entityType + " Entity",
flags: Desktop.AlwaysOnTop | Desktop.ForceNative, flags: Desktop.ALWAYS_ON_TOP,
presentationMode: Desktop.PresentationMode.NATIVE,
size: { x: 500, y: 300 }, size: { x: 500, y: 300 },
visible: true visible: true
}); });

3
scripts/system/modules/createWindow.js
View file

@ -92,7 +92,8 @@ module.exports = (function() {
var windowRect = getWindowRect(this.settingsKey, defaultRect); var windowRect = getWindowRect(this.settingsKey, defaultRect);
this.window = Desktop.createWindow(this.qmlPath, { this.window = Desktop.createWindow(this.qmlPath, {
title: this.title, title: this.title,
flags: Desktop.AlwaysOnTop | Desktop.ForceNative, flags: Desktop.ALWAYS_ON_TOP,
presentationMode: Desktop.PresentationMode.NATIVE,
size: windowRect.size, size: windowRect.size,
visible: true, visible: true,
position: windowRect.position position: windowRect.position