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

Ready for CR Thank you Zach

Browse source
This commit is contained in:
RebeccaStankus 2019-10-03 17:28:34 -07:00
parent 0e7dff05fb
commit 2f2b7b0306
4 changed files with 255 additions and 272 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
View file

@ -128,9 +128,6 @@ Rectangle {
// If we have never auto-selected and the user is still using a default avatar or if the current avatar is not valid (fst), or if // If we have never auto-selected and the user is still using a default avatar or if the current avatar is not valid (fst), or if
// the current avatar is the old default (Woody), use top avatar from inventory or one of the new defaults. // the current avatar is the old default (Woody), use top avatar from inventory or one of the new defaults.
// FOR TESTING__________REMOVE
userHasValidAvatarInInventory = false;
// If the current avatar URL is invalid, OR the user is using the "default avatar" (Woody)... // If the current avatar URL is invalid, OR the user is using the "default avatar" (Woody)...
if (!currentAvatarURLContainsFST || currentAvatarURLContainsDefaultAvatar) { if (!currentAvatarURLContainsFST || currentAvatarURLContainsDefaultAvatar) {
// If the user has a valid avatar in their inventory... // If the user has a valid avatar in their inventory...

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

@ -41,7 +41,6 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
source: "images/defaultTopLeft.png" source: "images/defaultTopLeft.png"
z: 1
} }
Image { Image {
@ -51,266 +50,253 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
source: "images/defaultBottomRight.png" source: "images/defaultBottomRight.png"
z: 1
} }
Item { Flickable {
id: tempAvatarPageContainer id: tempAvatarPageContainer
visible: true visible: true
anchors.fill: parent
clip: true
contentWidth: parent.width
contentHeight: tempAvatarPageGrid.height
Flickable { GridLayout {
anchors.fill: parent id: tempAvatarPageGrid
anchors.leftMargin: 50 width: parent.width
anchors.topMargin: 50 columns: 2
anchors.rightMargin: 100 rows: 1
clip: true
contentWidth: parent.width
contentHeight: childrenRect.height
GridLayout { Image {
id: tempAvatarPageGrid Layout.preferredWidth: 428
anchors.fill: parent Layout.minimumHeight: 240
columns: landscapeOrientation ? 2 : 1 Layout.maximumHeight: 800
rows: landscapeOrientation ? 1 : 2 Layout.fillHeight: true
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/" +
MyAvatar.skeletonModelURL.substring(MyAvatar.skeletonModelURL.indexOf("simplifiedAvatar"), MyAvatar.skeletonModelURL.lastIndexOf("/")) + ".png"
mipmap: true
fillMode: Image.PreserveAspectFit
}
Item { Item {
id: tempAvatarImageContainer id: textAndQRContainer
Layout.preferredWidth: tempAvatarImage.width Layout.minimumWidth: 300
Layout.preferredHeight: tempAvatarImage.height Layout.maximumWidth: 1680
Layout.fillWidth: true
Layout.preferredHeight: childrenRect.height
Image { HifiStylesUit.RalewayBold {
id: tempAvatarImage id: headerText
width: landscapeOrientation ? 428 : 320 text: "We know this isn't you..."
height: landscapeOrientation ? 800 : 598 color: simplifiedUI.colors.text.black
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/" + size: 48
MyAvatar.skeletonModelURL.substring(MyAvatar.skeletonModelURL.indexOf("simplifiedAvatar"), MyAvatar.skeletonModelURL.lastIndexOf("/")) + ".png" height: paintedHeight
} wrapMode: Text.Wrap
anchors.top: parent.top
anchors.topMargin: 120
anchors.left: parent.left
anchors.right: parent.right
}
HifiStylesUit.RalewayRegular {
id: descriptionText
anchors.top: headerText.bottom
anchors.topMargin: 10
anchors.left: parent.left
anchors.right: parent.right
height: paintedHeight
text: "but we've given you this <b>temporary avatar</b> to use " +
"for today. If you see this avatar in-world, walk up and " +
"say hello to other new users!<br><br>" +
"<b>We want you to be you</b> so we've built an Avatar Creator " +
"App that's as easy as taking a selfie and picking your " +
"outfits! Available now on iOS and Android."
color: simplifiedUI.colors.text.black
size: 22
wrapMode: Text.Wrap
} }
Item { Item {
id: textAndQRContainer id: qrAndInstructionsContainer
Layout.preferredWidth: 680 anchors.top: descriptionText.bottom
Layout.preferredHeight: childrenRect.height anchors.topMargin: 50
Layout.topMargin: landscapeOrientation ? 130 : 0 anchors.left: parent.left
anchors.right: parent.right
height: avatarAppQRCodeImage.height
HifiStylesUit.RalewayBold { Image {
id: headerText id: avatarAppQRCodeImage
text: "We know this isn't you..." source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg"
color: simplifiedUI.colors.text.black height: 190
size: 48 width: 190
wrapMode: Text.WordWrap mipmap: true
anchors.left: parent.left fillMode: Image.PreserveAspectFit
anchors.right: parent.right
} }
HifiStylesUit.RalewayRegular { HifiStylesUit.RalewayBold {
id: descriptionText id: instructionText
anchors.top: headerText.bottom anchors.top: avatarAppQRCodeImage.top
anchors.topMargin: 10 anchors.bottom: avatarAppQRCodeImage.bottom
text: "but, we've given you this <b>temporary avatar</b> to use anchors.left: avatarAppQRCodeImage.right
for today. If you see this avatar in-world, walk up and anchors.leftMargin: 30
say hello to other new users!<br></br><br></br> anchors.right: parent.right
<b>We want you to be you</b> so we've built an Avatar Creator text: "Use your mobile phone to scan this QR code."
App that's as easy as taking a selfie and picking your
outfits! Available now on iOS and Android Platforms."
color: simplifiedUI.colors.text.black color: simplifiedUI.colors.text.black
size: 22 size: 22
anchors.left: parent.left wrapMode: Text.Wrap
anchors.right: parent.right
wrapMode: Text.WordWrap
} }
}
Item { HifiStylesUit.RalewayBold {
id: qrAndInstructionsContainer anchors.top: qrAndInstructionsContainer.bottom
anchors.top: descriptionText.bottom anchors.topMargin: 50
height: avatarAppQRCodeImage.height anchors.left: parent.left
anchors.left: parent.left anchors.right: parent.right
anchors.right: parent.right horizontalAlignment: Text.AlignLeft
anchors.topMargin: 50 text: "Continue >"
color: simplifiedUI.colors.text.lightBlue
opacity: continueMouseArea.containsMouse ? 1.0 : 0.7
size: 36
height: paintedHeight
z: 1
Image { MouseArea {
id: avatarAppQRCodeImage id: continueMouseArea
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg" hoverEnabled: true
height: 190 anchors.fill: parent
width: 190
mipmap: true
fillMode: Image.PreserveAspectFit
}
HifiStylesUit.RalewayBold { onClicked: {
id: instructionText Tablet.playSound(TabletEnums.ButtonClick);
anchors.left: avatarAppQRCodeImage.right tempAvatarPageContainer.visible = false;
anchors.top: avatarAppQRCodeImage.top Settings.setValue("simplifiedUI/closedAvatarPageOfInitialLaunchWindow", true);
anchors.bottom: avatarAppQRCodeImage.bottom controlsContainer.visible = true;
anchors.right: parent.right
anchors.leftMargin: 30
text: "Use your mobile phone to scan this QR code."
color: simplifiedUI.colors.text.black
size: 22
wrapMode: Text.WordWrap
}
}
HifiStylesUit.RalewayBold {
anchors.top: qrAndInstructionsContainer.bottom
anchors.topMargin: 50
anchors.left: parent.left
anchors.right: parent.right
horizontalAlignment: Text.AlignLeft
text: "Continue >"
color: simplifiedUI.colors.text.lightBlue
opacity: continueMouseArea.containsMouse ? 1.0 : 0.7
size: 36
z: 1
wrapMode: Text.WordWrap
MouseArea {
id: continueMouseArea
hoverEnabled: true
anchors.fill: parent
onClicked: {
Tablet.playSound(TabletEnums.ButtonClick);
tempAvatarPageContainer.visible = false;
Settings.setValue("simplifiedUI/closedAvatarPageOfInitialLaunchWindow", true);
controlsContainer.visible = true;
}
} }
} }
} }
} }
} }
SimplifiedControls.VerticalScrollBar {
parent: tempAvatarPageContainer
}
} }
Item { Flickable {
id: controlsContainer id: controlsContainer
visible: false visible: false
anchors.fill: parent anchors.fill: parent
clip: true
contentWidth: parent.width
contentHeight: contentItem.childrenRect.height
Flickable { HifiStylesUit.RalewayRegular {
anchors.fill: parent id: controlsDescriptionText
clip: true text: "These are your avatar controls to <b>interact with and move around in your new HQ.</b>"
contentWidth: parent.width anchors.top: parent.top
contentHeight: childrenRect.height anchors.topMargin: 100
anchors.horizontalCenter: parent.horizontalCenter
horizontalAlignment: Text.AlignHCenter
height: paintedHeight
width: 850
color: simplifiedUI.colors.text.black
size: 36
wrapMode: Text.Wrap
}
HifiStylesUit.RalewayRegular { GridLayout {
id: controlsDescriptionText id: controlsPageGrid
text: "These are your avatar controls to <br></br> anchors.top: controlsDescriptionText.bottom
<b>interact with and move around in your new HQ.</b>" anchors.topMargin: 60
anchors.top: parent.top anchors.horizontalCenter: parent.horizontalCenter
anchors.topMargin: 100 width: controlsDescriptionText.width
anchors.horizontalCenter: parent.horizontalCenter columnSpacing: 50
horizontalAlignment: Text.AlignHCenter rowSpacing: 40
height: 100 columns: 2
width: 850 rows: 2
color: simplifiedUI.colors.text.black
size: 36
wrapMode: Text.WordWrap
}
GridLayout {
id: controlsPageGrid
anchors.top: controlsDescriptionText.bottom
anchors.topMargin: 60
anchors.bottomMargin: 80
anchors.horizontalCenter: parent.horizontalCenter
columnSpacing: 50
rowSpacing: 40
columns: 2
rows: 2
Image { Image {
Layout.preferredWidth: 360 Layout.preferredWidth: 360
Layout.preferredHeight: 225 Layout.preferredHeight: 225
id: walkingControls id: walkingControls
source: "images/walkingControls.png" source: "images/walkingControls.png"
} }
Image { Image {
Layout.preferredWidth: 360 Layout.preferredWidth: 360
Layout.preferredHeight: 200 Layout.preferredHeight: 200
id: mouseControls id: mouseControls
source: "images/mouseControls.png" source: "images/mouseControls.png"
}
Image {
Layout.preferredWidth: 240
Layout.preferredHeight: 160
Layout.alignment: Qt.AlignHCenter
id: runJumpControls
source: "images/runJumpControls.png"
}
Image {
Layout.preferredWidth: 160
Layout.preferredHeight: 100
Layout.alignment: Qt.AlignHCenter
id: cameraControls
source: "images/cameraControls.png"
}
} }
HifiStylesUit.RalewayBold { Image {
anchors.bottom: parent.bottom Layout.preferredWidth: 240
anchors.left: parent.left Layout.preferredHeight: 160
anchors.leftMargin: 50 Layout.alignment: Qt.AlignHCenter
anchors.bottomMargin: 50 id: runJumpControls
text: "Learn more about our controls." source: "images/runJumpControls.png"
width: 200
height: 25
color: simplifiedUI.colors.text.lightBlue
opacity: learnMoreAboutControlsMouseArea.containsMouse ? 1.0 : 0.7
size: 14
wrapMode: Text.WordWrap
MouseArea {
id: learnMoreAboutControlsMouseArea
hoverEnabled: true
anchors.fill: parent
onClicked: {
Tablet.playSound(TabletEnums.ButtonClick);
Qt.openUrlExternally("https://www.highfidelity.com/knowledge/get-around");
}
}
} }
HifiStylesUit.RalewayBold { Image {
anchors.top: controlsPageGrid.bottom Layout.preferredWidth: 160
anchors.horizontalCenter: parent.horizontalCenter Layout.preferredHeight: 100
anchors.topMargin: 50 Layout.alignment: Qt.AlignHCenter
text: "I've got a good grip on the controls." id: cameraControls
width: 650 source: "images/cameraControls.png"
height: 60
color: simplifiedUI.colors.text.lightBlue
opacity: goodGripMouseArea.containsMouse ? 1.0 : 0.7
size: 36
wrapMode: Text.WordWrap
MouseArea {
id: goodGripMouseArea
hoverEnabled: true
anchors.fill: parent
onClicked: {
Tablet.playSound(TabletEnums.ButtonClick);
sendToScript({
"source": "InitialLaunchWindow.qml",
"method": "closeInitialLaunchWindow"
});
}
}
} }
} }
SimplifiedControls.VerticalScrollBar { HifiStylesUit.RalewayBold {
parent: controlsContainer id: iHaveAGoodGrip
anchors.top: controlsPageGrid.bottom
anchors.horizontalCenter: parent.horizontalCenter
anchors.topMargin: 50
text: "I've got a good grip on the controls."
width: 650
height: paintedHeight
color: simplifiedUI.colors.text.lightBlue
opacity: goodGripMouseArea.containsMouse ? 1.0 : 0.7
size: 36
wrapMode: Text.Wrap
MouseArea {
id: goodGripMouseArea
hoverEnabled: true
anchors.fill: parent
onClicked: {
Tablet.playSound(TabletEnums.ButtonClick);
sendToScript({
"source": "InitialLaunchWindow.qml",
"method": "closeInitialLaunchWindow"
});
}
}
} }
HifiStylesUit.RalewayBold {
anchors.top: iHaveAGoodGrip.bottom
anchors.topMargin: 50
anchors.left: parent.left
anchors.leftMargin: 50
text: "Learn more about our controls."
width: 200
height: paintedHeight
color: simplifiedUI.colors.text.lightBlue
opacity: learnMoreAboutControlsMouseArea.containsMouse ? 1.0 : 0.7
size: 14
wrapMode: Text.Wrap
MouseArea {
id: learnMoreAboutControlsMouseArea
hoverEnabled: true
anchors.fill: parent
onClicked: {
Tablet.playSound(TabletEnums.ButtonClick);
Qt.openUrlExternally("https://www.highfidelity.com/knowledge/get-around");
}
}
}
}
SimplifiedControls.VerticalScrollBar {
parent: controlsContainer.visible ? controlsContainer : tempAvatarPageContainer
z: 2
} }
signal sendToScript(var message); signal sendToScript(var message);

80
scripts/simplifiedUI/ui/simplifiedFTUE/SecondLaunchWindow.qml
View file

@ -20,7 +20,6 @@ Rectangle {
id: root id: root
color: simplifiedUI.colors.white color: simplifiedUI.colors.white
anchors.fill: parent anchors.fill: parent
property bool landscapeOrientation: root.width > root.height
SimplifiedConstants.SimplifiedConstants { SimplifiedConstants.SimplifiedConstants {
id: simplifiedUI id: simplifiedUI
@ -46,86 +45,92 @@ Rectangle {
z: 1 z: 1
} }
Item { Flickable {
id: tempAvatarPageContainer id: tempAvatarPageContainer
visible: true
anchors.fill: parent
clip: true
contentWidth: parent.width
contentHeight: tempAvatarPageGrid.height
GridLayout { GridLayout {
id: tempAvatarPageGrid id: tempAvatarPageGrid
anchors.fill: parent width: parent.width
anchors.leftMargin: 50 columns: 2
anchors.bottomMargin: 50 rows: 1
anchors.rightMargin: 50
columns: landscapeOrientation ? 2 : 1
rows: landscapeOrientation ? 1 : 2
Item { Image {
id: heroImageContainer Layout.preferredWidth: 428
Layout.preferredWidth: heroImage.width Layout.minimumHeight: 240
Layout.preferredHeight: heroImage.height Layout.maximumHeight: 800
Layout.fillHeight: true
Image { source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/hero.png"
id: heroImage mipmap: true
width: 428 fillMode: Image.PreserveAspectFit
height: 800
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/hero.png"
}
} }
Item { Item {
id: textAndQRContainer id: textAndQRContainer
Layout.preferredWidth: 720 Layout.minimumWidth: 300
Layout.maximumWidth: 1680
Layout.fillWidth: true
Layout.preferredHeight: childrenRect.height Layout.preferredHeight: childrenRect.height
Layout.topMargin: 150
HifiStylesUit.RalewayBold { HifiStylesUit.RalewayBold {
id: headerText id: headerText
text: "Stand out from the crowd!" text: "Stand out from the crowd!"
color: simplifiedUI.colors.text.black color: simplifiedUI.colors.text.black
size: 48 size: 48
wrapMode: Text.WordWrap height: paintedHeight
wrapMode: Text.Wrap
anchors.top: parent.top
anchors.topMargin: 120
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
} }
HifiStylesUit.RalewayRegular { HifiStylesUit.RalewayRegular {
id: descriptionText id: descriptionText
width: 600
anchors.top: headerText.bottom anchors.top: headerText.bottom
anchors.topMargin: 10 anchors.topMargin: 10
text: "You can create and upload custom avatars from our Avatar Creator App. It's as easy as taking a selfie. Available now on iOS and Android Platforms." anchors.left: parent.left
anchors.right: parent.right
height: paintedHeight
text: "You can create and upload custom avatars from our Avatar Creator App. " +
"It's as easy as taking a selfie. Available now on iOS and Android Platforms."
color: simplifiedUI.colors.text.black color: simplifiedUI.colors.text.black
size: 24 size: 24
anchors.left: parent.left wrapMode: Text.Wrap
wrapMode: Text.WordWrap
} }
Item { Item {
id: qrAndInstructionsContainer id: qrAndInstructionsContainer
anchors.top: descriptionText.bottom anchors.top: descriptionText.bottom
anchors.topMargin: 50
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right
height: avatarAppQRCodeImage.height height: avatarAppQRCodeImage.height
width: parent.width
anchors.topMargin: 150
Image { Image {
id: avatarAppQRCodeImage id: avatarAppQRCodeImage
anchors.left: parent.left
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg" source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg"
height: 180 height: 190
width: 180 width: 190
mipmap: true
fillMode: Image.PreserveAspectFit
} }
HifiStylesUit.RalewayBold { HifiStylesUit.RalewayBold {
id: instructionText id: instructionText
anchors.top: avatarAppQRCodeImage.top
anchors.bottom: avatarAppQRCodeImage.bottom
anchors.left: avatarAppQRCodeImage.right anchors.left: avatarAppQRCodeImage.right
anchors.leftMargin: 20 anchors.leftMargin: 30
anchors.verticalCenter: avatarAppQRCodeImage.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.top: avatarAppQRCodeImage.bottom
text: "Use your mobile phone to scan this QR code." text: "Use your mobile phone to scan this QR code."
color: simplifiedUI.colors.text.black color: simplifiedUI.colors.text.black
size: 24 size: 24
wrapMode: Text.WordWrap wrapMode: Text.Wrap
} }
} }
@ -139,8 +144,8 @@ Rectangle {
color: simplifiedUI.colors.text.lightBlue color: simplifiedUI.colors.text.lightBlue
opacity: continueMouseArea.containsMouse ? 1.0 : 0.7 opacity: continueMouseArea.containsMouse ? 1.0 : 0.7
size: 36 size: 36
height: paintedHeight
z: 1 z: 1
wrapMode: Text.WordWrap
MouseArea { MouseArea {
id: continueMouseArea id: continueMouseArea
@ -160,7 +165,8 @@ Rectangle {
} }
SimplifiedControls.VerticalScrollBar { SimplifiedControls.VerticalScrollBar {
parent: root parent: tempAvatarPageContainer
z: 2
} }
} }

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

@ -363,9 +363,8 @@ var INITIAL_LAUNCH_QML_PATH = Script.resolvePath("./simplifiedFTUE/InitialLaunch
var INITIAL_LAUNCH_WINDOW_TITLE = "Initial Launch"; var INITIAL_LAUNCH_WINDOW_TITLE = "Initial Launch";
var INITIAL_LAUNCH_PRESENTATION_MODE = Desktop.PresentationMode.NATIVE; var INITIAL_LAUNCH_PRESENTATION_MODE = Desktop.PresentationMode.NATIVE;
var INITIAL_LAUNCH_WIDTH_PX = Window.innerWidth; var INITIAL_LAUNCH_WIDTH_PX = Window.innerWidth;
var INITIAL_LAUNCH_HEIGHT_PX = Window.innerHeight + TOP_BAR_HEIGHT_PX; var INITIAL_LAUNCH_HEIGHT_PX = Window.innerHeight - TOP_BAR_HEIGHT_PX;
var INITIAL_WINDOW_FLAGS = 0x00000001 | // Qt::Window var INITIAL_WINDOW_FLAGS = 0x00000001 | // Qt::Window
0x00000008 | // Qt::Popup
0x00000800 | // Qt::FramelessWindowHint 0x00000800 | // Qt::FramelessWindowHint
0x40000000; // Qt::NoDropShadowWindowHint 0x40000000; // Qt::NoDropShadowWindowHint
var initialLaunchWindow = false; var initialLaunchWindow = false;
@ -387,7 +386,7 @@ function displayInitialLaunchWindow() {
}, },
position: { position: {
x: Window.x, x: Window.x,
y: Window.y y: Window.y + TOP_BAR_HEIGHT_PX
}, },
overrideFlags: INITIAL_WINDOW_FLAGS overrideFlags: INITIAL_WINDOW_FLAGS
}); });
@ -401,9 +400,8 @@ var SECOND_LAUNCH_QML_PATH = Script.resolvePath("simplifiedFTUE/SecondLaunchWind
var SECOND_LAUNCH_WINDOW_TITLE = "Second Launch"; var SECOND_LAUNCH_WINDOW_TITLE = "Second Launch";
var SECOND_LAUNCH_PRESENTATION_MODE = Desktop.PresentationMode.NATIVE; var SECOND_LAUNCH_PRESENTATION_MODE = Desktop.PresentationMode.NATIVE;
var SECOND_LAUNCH_WIDTH_PX = Window.innerWidth; var SECOND_LAUNCH_WIDTH_PX = Window.innerWidth;
var SECOND_LAUNCH_HEIGHT_PX = Window.innerHeight + TOP_BAR_HEIGHT_PX; var SECOND_LAUNCH_HEIGHT_PX = Window.innerHeight - TOP_BAR_HEIGHT_PX;
var SECOND_WINDOW_FLAGS = 0x00000001 | // Qt::Window var SECOND_WINDOW_FLAGS = 0x00000001 | // Qt::Window
0x00000008 | // Qt::Popup
0x00000800 | // Qt::FramelessWindowHint 0x00000800 | // Qt::FramelessWindowHint
0x40000000; // Qt::NoDropShadowWindowHint 0x40000000; // Qt::NoDropShadowWindowHint
var secondLaunchWindow = false; var secondLaunchWindow = false;
@ -425,7 +423,7 @@ function displaySecondLaunchWindow() {
}, },
position: { position: {
x: Window.x, x: Window.x,
y: Window.y y: Window.y + TOP_BAR_HEIGHT_PX
}, },
overrideFlags: SECOND_WINDOW_FLAGS overrideFlags: SECOND_WINDOW_FLAGS
}); });
@ -664,32 +662,28 @@ function onGeometryChanged(rect) {
}; };
topBarWindow.position = { topBarWindow.position = {
"x": rect.x, "x": rect.x,
"y": rect.y "y": rect.y
}; };
} }
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
}; };
initialLaunchWindow.position = { initialLaunchWindow.position = {
"x": rect.x, "x": rect.x,
"y": rect.y "y": rect.y + TOP_BAR_HEIGHT_PX
}; };
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
}; };
secondLaunchWindow.position = { secondLaunchWindow.position = {
"x": rect.x, "x": rect.x,
"y": rect.y "y": rect.y + TOP_BAR_HEIGHT_PX
}; };
print("NOW THE SECOND WINDOW size IS: ", JSON.stringify(secondLaunchWindow.size), " AND position IS: ", JSON.stringify(secondLaunchWindow.position));
} }
} }