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

Handle minimized window

Browse source
This commit is contained in:
RebeccaStankus 2019-10-03 12:16:39 -07:00
parent b23aecf6c5
commit 1dd6aebede
2 changed files with 48 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/simplifiedUI/ui/simplifiedFTUE/InitialLaunchWindow.qml
View file

@ -27,7 +27,8 @@ Rectangle {
} }
Component.onCompleted: { Component.onCompleted: {
if (Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatarFromInventory", false)) { if (Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatarFromInventory", false) ||
Settings.getValue("simplifiedUI/closedAvatarPageOfInitialLaunchWindow", false)) {
tempAvatarPageContainer.visible = false; tempAvatarPageContainer.visible = false;
controlsContainer.visible = true; controlsContainer.visible = true;
} }
@ -165,6 +166,7 @@ Rectangle {
onClicked: { onClicked: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
tempAvatarPageContainer.visible = false; tempAvatarPageContainer.visible = false;
Settings.setValue("simplifiedUI/closedAvatarPageOfInitialLaunchWindow", true);
controlsContainer.visible = true; controlsContainer.visible = true;
} }
} }

66
scripts/simplifiedUI/ui/simplifiedUI.js
View file

@ -438,22 +438,16 @@ function displaySecondLaunchWindow() {
function closeInitialLaunchWindow() { function closeInitialLaunchWindow() {
if (initialLaunchWindow) { if (initialLaunchWindow) {
initialLaunchWindow.fromQml.disconnect(onMessageFromInitialLaunchWindow); initialLaunchWindow.fromQml.disconnect(onMessageFromInitialLaunchWindow);
var homeLocation = LocationBookmarks.getAddress("hqhome");
if (homeLocation) {
Window.location = homeLocation;
}
initialLaunchWindow.close(); initialLaunchWindow.close();
initialLaunchWindow = null;
} }
} }
function closeSecondLaunchWindow() { function closeSecondLaunchWindow() {
if (secondLaunchWindow) { if (secondLaunchWindow) {
secondLaunchWindow.fromQml.disconnect(onMessageFromSecondLaunchWindow); secondLaunchWindow.fromQml.disconnect(onMessageFromSecondLaunchWindow);
var homeLocation = LocationBookmarks.getAddress("hqhome");
if (homeLocation) {
Window.location = homeLocation;
}
secondLaunchWindow.close(); secondLaunchWindow.close();
secondLaunchWindow = null;
} }
} }
@ -466,6 +460,10 @@ function onMessageFromInitialLaunchWindow(message) {
switch (message.method) { switch (message.method) {
case "closeInitialLaunchWindow": case "closeInitialLaunchWindow":
closeInitialLaunchWindow(); closeInitialLaunchWindow();
var homeLocation = LocationBookmarks.getAddress("hqhome");
if (homeLocation) {
Window.location = homeLocation;
}
break; break;
default: default:
@ -483,6 +481,10 @@ function onMessageFromSecondLaunchWindow(message) {
switch (message.method) { switch (message.method) {
case "closeSecondLaunchWindow": case "closeSecondLaunchWindow":
closeSecondLaunchWindow(); closeSecondLaunchWindow();
var homeLocation = LocationBookmarks.getAddress("hqhome");
if (homeLocation) {
Window.location = homeLocation;
}
break; break;
default: default:
@ -666,6 +668,7 @@ function onGeometryChanged(rect) {
}; };
} }
if (initialLaunchWindow) { if (initialLaunchWindow) {
print("GEOMETRY CHANGED, INITIAL WINDOW. rect.width: ", rect.width, " AND rect.height: ", rect.height, " AND rect.x: ", rect.x, " AND rect.y: ", rect.y);
initialLaunchWindow.size = { initialLaunchWindow.size = {
"x": rect.width, "x": rect.width,
"y": rect.height "y": rect.height
@ -674,8 +677,10 @@ function onGeometryChanged(rect) {
"x": rect.x, "x": rect.x,
"y": rect.y "y": rect.y
}; };
print("NOW THE INITIAL WINDOW size IS: ", JSON.stringify(initialLaunchWindow.size), " AND position IS: ", JSON.stringify(initialLaunchWindow.position));
} }
if (secondLaunchWindow) { if (secondLaunchWindow) {
print("GEOMETRY CHANGED, SECOND WINDOW. rect.width: ", rect.width, " AND rect.height: ", rect.height, " AND rect.x: ", rect.x, " AND rect.y: ", rect.y);
secondLaunchWindow.size = { secondLaunchWindow.size = {
"x": rect.width, "x": rect.width,
"y": rect.height "y": rect.height
@ -684,24 +689,39 @@ function onGeometryChanged(rect) {
"x": rect.x, "x": rect.x,
"y": rect.y "y": rect.y
}; };
print("NOW THE SECOND WINDOW size IS: ", JSON.stringify(secondLaunchWindow.size), " AND position IS: ", JSON.stringify(secondLaunchWindow.position));
} }
} }
var initialLaunchWindowIsMinimized = false;
var secondLaunchWindowIsMinimized = false;
function onWindowMinimizedChanged(isMinimized) { function onWindowMinimizedChanged(isMinimized) {
if (isMinimized) { if (isMinimized) {
if (initialLaunchWindow) { handleInitialLaunchWindowVisibleChanged(false);
initialLaunchWindow.setVisible(false); handleSecondLaunchWindowVisibleChanged(false);
} } else if (!HMD.active) {
if (secondLaunchWindow) { handleInitialLaunchWindowVisibleChanged(true);
secondLaunchWindow.setVisible(false); handleSecondLaunchWindowVisibleChanged(true);
} }
} else { }
if (initialLaunchWindow) {
initialLaunchWindow.show(); function handleInitialLaunchWindowVisibleChanged(shouldBeVisible) {
} if (shouldBeVisible && !initialLaunchWindow && initialLaunchWindowIsMinimized) {
if (secondLaunchWindow) { displayInitialLaunchWindow();
secondLaunchWindow.show(); initialLaunchWindowIsMinimized = false;
} } else if (!shouldBeVisible && initialLaunchWindow) {
closeInitialLaunchWindow();
initialLaunchWindowIsMinimized = true;
}
}
function handleSecondLaunchWindowVisibleChanged(shouldBeVisible) {
if (shouldBeVisible && !secondLaunchWindow && secondLaunchWindowIsMinimized) {
displaySecondLaunchWindow();
secondLaunchWindowIsMinimized = false;
} else if (!shouldBeVisible && secondLaunchWindow) {
closeSecondLaunchWindow();
secondLaunchWindowIsMinimized = true;
} }
} }
@ -712,8 +732,12 @@ function onDisplayModeChanged(isHMDMode) {
if (isHMDMode) { if (isHMDMode) {
onHMDInputDeviceMutedChanged(Audio.mutedHMD); onHMDInputDeviceMutedChanged(Audio.mutedHMD);
handleInitialLaunchWindowVisibleChanged(false);
handleSecondLaunchWindowVisibleChanged(false);
} else { } else {
onDesktopInputDeviceMutedChanged(Audio.mutedDesktop); onDesktopInputDeviceMutedChanged(Audio.mutedDesktop);
handleInitialLaunchWindowVisibleChanged(true);
handleSecondLaunchWindowVisibleChanged(true);
} }
} }