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

Merge pull request #15945 from huffman/fix/create-window-not-reopening

Browse source 
BUGZ-998: Fix create window being destroyed when closed
This commit is contained in:
Shannon Romano 2019-07-19 11:07:02 -07:00 committed by GitHub
commit 4f7b865cfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/InteractiveWindow.qml
View file

@ -30,7 +30,6 @@ Windows.Window {
signal selfDestruct(); signal selfDestruct();
property var flags: 0;
property var additionalFlags: 0; property var additionalFlags: 0;
property var overrideFlags: 0; property var overrideFlags: 0;
@ -158,8 +157,7 @@ Windows.Window {
if (Qt.platform.os !== "windows" && (root.additionalFlags & Desktop.ALWAYS_ON_TOP)) { if (Qt.platform.os !== "windows" && (root.additionalFlags & Desktop.ALWAYS_ON_TOP)) {
nativeWindowFlags |= Qt.WindowStaysOnTopHint; nativeWindowFlags |= Qt.WindowStaysOnTopHint;
} }
root.flags = root.overrideFlags || nativeWindowFlags; nativeWindow.flags = root.overrideFlags || nativeWindowFlags;
nativeWindow.flags = root.flags;
nativeWindow.x = interactiveWindowPosition.x; nativeWindow.x = interactiveWindowPosition.x;
nativeWindow.y = interactiveWindowPosition.y; nativeWindow.y = interactiveWindowPosition.y;
@ -317,7 +315,7 @@ Windows.Window {
// set invisible on close, to make it not re-appear unintended after switching PresentationMode // set invisible on close, to make it not re-appear unintended after switching PresentationMode
interactiveWindowVisible = false; interactiveWindowVisible = false;
if ((root.flags & Desktop.CLOSE_BUTTON_HIDES) !== Desktop.CLOSE_BUTTON_HIDES) { if ((root.additionalFlags & Desktop.CLOSE_BUTTON_HIDES) !== Desktop.CLOSE_BUTTON_HIDES) {
selfDestruct(); selfDestruct();
} }
} }