Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 03:50:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Create app (desktop mode):

Browse source 
- Fix insta-close on switching from other app to create app.
- Fix new model and particle dialogs.
This commit is contained in:
Thijs Wenker 2018-07-05 17:57:00 +02:00
parent d5fb094d8a
commit 574bfd177d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
scripts/system/edit.js
View file

@ -578,7 +578,7 @@ var toolBar = (function () {
}); });
createButton = activeButton; createButton = activeButton;
tablet.screenChanged.connect(function (type, url) { tablet.screenChanged.connect(function (type, url) {
var isGoingToHomescreenOnDesktop = (!HMD.active && url === 'hifi/tablet/TabletHome.qml'); var isGoingToHomescreenOnDesktop = (!HMD.active && (url === 'hifi/tablet/TabletHome.qml' || url === ''));
if (isActive && (type !== "QML" || url !== "hifi/tablet/Edit.qml") && !isGoingToHomescreenOnDesktop) { if (isActive && (type !== "QML" || url !== "hifi/tablet/Edit.qml") && !isGoingToHomescreenOnDesktop) {
that.setActive(false); that.setActive(false);
} }
@ -611,7 +611,8 @@ var toolBar = (function () {
tablet.pushOntoStack("hifi/tablet/New" + entityType + "Dialog.qml"); tablet.pushOntoStack("hifi/tablet/New" + entityType + "Dialog.qml");
} else { } else {
closeExistingDialogWindow(); closeExistingDialogWindow();
dialogWindow = Desktop.createWindow("qml/hifi/tablet/New" + entityType + "Window.qml", { var qmlPath = Script.resourcesPath() + "qml/hifi/tablet/New" + entityType + "Window.qml";
dialogWindow = Desktop.createWindow(qmlPath, {
title: "New " + entityType + " Entity", title: "New " + entityType + " Entity",
flags: Desktop.ALWAYS_ON_TOP | Desktop.CLOSE_BUTTON_HIDES, flags: Desktop.ALWAYS_ON_TOP | Desktop.CLOSE_BUTTON_HIDES,
presentationMode: Desktop.PresentationMode.NATIVE, presentationMode: Desktop.PresentationMode.NATIVE,