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

More iteration with Joshua

Browse source
This commit is contained in:
Zach Fox 2019-10-08 17:31:10 -04:00
parent 42bf2bf30e
commit 753a61ed2c
2 changed files with 11 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,7 +50,7 @@ Rectangle {
Image { Image {
id: avatarImage id: avatarImage
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
height: Math.min(Math.max(parent.height - 24, 350), 898) height: Math.max(parent.height - 48, 350)
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 12 anchors.leftMargin: 12
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/" + source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/" +
@ -67,6 +67,7 @@ Rectangle {
anchors.bottom: qrAndInstructionsContainer.top anchors.bottom: qrAndInstructionsContainer.top
anchors.bottomMargin: 32 anchors.bottomMargin: 32
anchors.left: avatarImage.right anchors.left: avatarImage.right
anchors.leftMargin: 48
anchors.right: parent.right anchors.right: parent.right
contentWidth: width contentWidth: width
contentHeight: contentItem.childrenRect.height contentHeight: contentItem.childrenRect.height
@ -112,10 +113,11 @@ Rectangle {
Item { Item {
id: qrAndInstructionsContainer id: qrAndInstructionsContainer
anchors.left: avatarImage.right anchors.left: avatarImage.right
anchors.leftMargin: 48
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 16 anchors.rightMargin: 16
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: 190 height: 130
Image { Image {
id: avatarAppQRCodeImage id: avatarAppQRCodeImage
@ -123,7 +125,7 @@ Rectangle {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
width: 190 width: 130
mipmap: true mipmap: true
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
} }
@ -156,7 +158,7 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 32 anchors.rightMargin: 32
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: continueLink.height + learnMoreAvatarLink.height + 48 height: continueLink.height + 48
HifiStylesUit.RalewayBold { HifiStylesUit.RalewayBold {
id: continueLink id: continueLink
@ -183,32 +185,6 @@ Rectangle {
} }
} }
} }
HifiStylesUit.RalewayBold {
id: learnMoreAvatarLink
anchors.left: parent.left
anchors.leftMargin: 16
anchors.top: continueLink.bottom
anchors.topMargin: 8
text: "Learn more about custom avatars."
width: paintedWidth
height: paintedHeight
color: simplifiedUI.colors.text.lightBlue
opacity: learnMoreAboutAvatarsMouseArea.containsMouse ? 1.0 : 0.7
size: 14
wrapMode: Text.Wrap
MouseArea {
id: learnMoreAboutAvatarsMouseArea
hoverEnabled: true
anchors.fill: parent
onClicked: {
Tablet.playSound(TabletEnums.ButtonClick);
Qt.openUrlExternally("https://www.highfidelity.com/knowledge/avatars");
}
}
}
} }
} }

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

@ -35,7 +35,7 @@ Rectangle {
Image { Image {
id: avatarImage id: avatarImage
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
height: Math.min(Math.max(parent.height - 24, 350), 898) height: Math.max(parent.height - 48, 350)
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 12 anchors.leftMargin: 12
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/hero.png" source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/hero.png"
@ -49,6 +49,7 @@ Rectangle {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: 32 anchors.bottomMargin: 32
anchors.left: avatarImage.right anchors.left: avatarImage.right
anchors.leftMargin: 48
anchors.right: parent.right anchors.right: parent.right
Flickable { Flickable {
@ -103,7 +104,7 @@ Rectangle {
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg" source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg"
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
width: 190 width: 130
height: width height: width
mipmap: true mipmap: true
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
@ -165,8 +166,8 @@ Rectangle {
Image { Image {
id: topLeftAccentImage id: topLeftAccentImage
width: 180 width: 130
height: 450 height: 320
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
source: "images/standOutTopLeft.png" source: "images/standOutTopLeft.png"