mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Wrap Items in Flickables so scrollbars will work - contents of flickable not showing up rn
This commit is contained in:
Zach Fox
parent
1dd6aebede
commit
0e7dff05fb
1 changed files with 217 additions and 202 deletions
|
|
@ -58,116 +58,123 @@ Rectangle {
|
|||
id: tempAvatarPageContainer
|
||||
visible: true
|
||||
|
||||
GridLayout {
|
||||
id: tempAvatarPageGrid
|
||||
Flickable {
|
||||
anchors.fill: parent
|
||||
anchors.leftMargin: 50
|
||||
anchors.topMargin: 50
|
||||
anchors.rightMargin: 100
|
||||
columns: landscapeOrientation ? 2 : 1
|
||||
rows: landscapeOrientation ? 1 : 2
|
||||
clip: true
|
||||
contentWidth: parent.width
|
||||
contentHeight: childrenRect.height
|
||||
|
||||
Item {
|
||||
id: tempAvatarImageContainer
|
||||
Layout.preferredWidth: tempAvatarImage.width
|
||||
Layout.preferredHeight: tempAvatarImage.height
|
||||
GridLayout {
|
||||
id: tempAvatarPageGrid
|
||||
anchors.fill: parent
|
||||
columns: landscapeOrientation ? 2 : 1
|
||||
rows: landscapeOrientation ? 1 : 2
|
||||
|
||||
Image {
|
||||
id: tempAvatarImage
|
||||
width: landscapeOrientation ? 428 : 320
|
||||
height: landscapeOrientation ? 800 : 598
|
||||
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/" +
|
||||
MyAvatar.skeletonModelURL.substring(MyAvatar.skeletonModelURL.indexOf("simplifiedAvatar"), MyAvatar.skeletonModelURL.lastIndexOf("/")) + ".png"
|
||||
}
|
||||
}
|
||||
Item {
|
||||
id: tempAvatarImageContainer
|
||||
Layout.preferredWidth: tempAvatarImage.width
|
||||
Layout.preferredHeight: tempAvatarImage.height
|
||||
|
||||
Item {
|
||||
id: textAndQRContainer
|
||||
Layout.preferredWidth: 680
|
||||
Layout.preferredHeight: childrenRect.height
|
||||
Layout.topMargin: landscapeOrientation ? 130 : 0
|
||||
|
||||
HifiStylesUit.RalewayBold {
|
||||
id: headerText
|
||||
text: "We know this isn't you..."
|
||||
color: simplifiedUI.colors.text.black
|
||||
size: 48
|
||||
wrapMode: Text.WordWrap
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
}
|
||||
|
||||
HifiStylesUit.RalewayRegular {
|
||||
id: descriptionText
|
||||
anchors.top: headerText.bottom
|
||||
anchors.topMargin: 10
|
||||
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><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 Platforms."
|
||||
color: simplifiedUI.colors.text.black
|
||||
size: 22
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
wrapMode: Text.WordWrap
|
||||
Image {
|
||||
id: tempAvatarImage
|
||||
width: landscapeOrientation ? 428 : 320
|
||||
height: landscapeOrientation ? 800 : 598
|
||||
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/" +
|
||||
MyAvatar.skeletonModelURL.substring(MyAvatar.skeletonModelURL.indexOf("simplifiedAvatar"), MyAvatar.skeletonModelURL.lastIndexOf("/")) + ".png"
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
id: qrAndInstructionsContainer
|
||||
anchors.top: descriptionText.bottom
|
||||
height: avatarAppQRCodeImage.height
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.topMargin: 50
|
||||
id: textAndQRContainer
|
||||
Layout.preferredWidth: 680
|
||||
Layout.preferredHeight: childrenRect.height
|
||||
Layout.topMargin: landscapeOrientation ? 130 : 0
|
||||
|
||||
Image {
|
||||
id: avatarAppQRCodeImage
|
||||
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg"
|
||||
height: 190
|
||||
width: 190
|
||||
mipmap: true
|
||||
fillMode: Image.PreserveAspectFit
|
||||
HifiStylesUit.RalewayBold {
|
||||
id: headerText
|
||||
text: "We know this isn't you..."
|
||||
color: simplifiedUI.colors.text.black
|
||||
size: 48
|
||||
wrapMode: Text.WordWrap
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
}
|
||||
|
||||
HifiStylesUit.RalewayRegular {
|
||||
id: descriptionText
|
||||
anchors.top: headerText.bottom
|
||||
anchors.topMargin: 10
|
||||
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><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 Platforms."
|
||||
color: simplifiedUI.colors.text.black
|
||||
size: 22
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
wrapMode: Text.WordWrap
|
||||
}
|
||||
|
||||
Item {
|
||||
id: qrAndInstructionsContainer
|
||||
anchors.top: descriptionText.bottom
|
||||
height: avatarAppQRCodeImage.height
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.topMargin: 50
|
||||
|
||||
Image {
|
||||
id: avatarAppQRCodeImage
|
||||
source: resourceDirectoryUrl + "qml/hifi/simplifiedUI/avatarApp/images/qrCode.jpg"
|
||||
height: 190
|
||||
width: 190
|
||||
mipmap: true
|
||||
fillMode: Image.PreserveAspectFit
|
||||
}
|
||||
|
||||
HifiStylesUit.RalewayBold {
|
||||
id: instructionText
|
||||
anchors.left: avatarAppQRCodeImage.right
|
||||
anchors.top: avatarAppQRCodeImage.top
|
||||
anchors.bottom: avatarAppQRCodeImage.bottom
|
||||
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 {
|
||||
id: instructionText
|
||||
anchors.left: avatarAppQRCodeImage.right
|
||||
anchors.top: avatarAppQRCodeImage.top
|
||||
anchors.bottom: avatarAppQRCodeImage.bottom
|
||||
anchors.top: qrAndInstructionsContainer.bottom
|
||||
anchors.topMargin: 50
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.leftMargin: 30
|
||||
text: "Use your mobile phone to scan this QR code."
|
||||
color: simplifiedUI.colors.text.black
|
||||
size: 22
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
text: "Continue >"
|
||||
color: simplifiedUI.colors.text.lightBlue
|
||||
opacity: continueMouseArea.containsMouse ? 1.0 : 0.7
|
||||
size: 36
|
||||
z: 1
|
||||
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
|
||||
|
||||
MouseArea {
|
||||
id: continueMouseArea
|
||||
hoverEnabled: true
|
||||
anchors.fill: parent
|
||||
|
||||
onClicked: {
|
||||
Tablet.playSound(TabletEnums.ButtonClick);
|
||||
tempAvatarPageContainer.visible = false;
|
||||
Settings.setValue("simplifiedUI/closedAvatarPageOfInitialLaunchWindow", true);
|
||||
controlsContainer.visible = true;
|
||||
onClicked: {
|
||||
Tablet.playSound(TabletEnums.ButtonClick);
|
||||
tempAvatarPageContainer.visible = false;
|
||||
Settings.setValue("simplifiedUI/closedAvatarPageOfInitialLaunchWindow", true);
|
||||
controlsContainer.visible = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -184,117 +191,125 @@ Rectangle {
|
|||
visible: false
|
||||
anchors.fill: parent
|
||||
|
||||
Flickable {
|
||||
anchors.fill: parent
|
||||
clip: true
|
||||
contentWidth: parent.width
|
||||
contentHeight: childrenRect.height
|
||||
|
||||
HifiStylesUit.RalewayRegular {
|
||||
id: controlsDescriptionText
|
||||
text: "These are your avatar controls to <br></br>
|
||||
<b>interact with and move around in your new HQ.</b>"
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 100
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
height: 100
|
||||
width: 850
|
||||
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 {
|
||||
Layout.preferredWidth: 360
|
||||
Layout.preferredHeight: 225
|
||||
id: walkingControls
|
||||
source: "images/walkingControls.png"
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: 360
|
||||
Layout.preferredHeight: 200
|
||||
id: mouseControls
|
||||
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 {
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 50
|
||||
anchors.bottomMargin: 50
|
||||
text: "Learn more about our controls."
|
||||
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 {
|
||||
anchors.top: controlsPageGrid.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.topMargin: 50
|
||||
text: "I've got a good grip on the controls."
|
||||
width: 650
|
||||
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 {
|
||||
parent: tempAvatarPageContainer
|
||||
}
|
||||
|
||||
HifiStylesUit.RalewayRegular {
|
||||
id: controlsDescriptionText
|
||||
text: "These are your avatar controls to <br></br>
|
||||
<b>interact with and move around in your new HQ.</b>"
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 100
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
horizontalAlignment: Text.AlignHCenter
|
||||
height: 100
|
||||
width: 850
|
||||
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 {
|
||||
Layout.preferredWidth: 360
|
||||
Layout.preferredHeight: 225
|
||||
id: walkingControls
|
||||
source: "images/walkingControls.png"
|
||||
}
|
||||
|
||||
Image {
|
||||
Layout.preferredWidth: 360
|
||||
Layout.preferredHeight: 200
|
||||
id: mouseControls
|
||||
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 {
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.leftMargin: 50
|
||||
anchors.bottomMargin: 50
|
||||
text: "Learn more about our controls."
|
||||
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 {
|
||||
anchors.top: controlsPageGrid.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.topMargin: 50
|
||||
text: "I've got a good grip on the controls."
|
||||
width: 650
|
||||
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"
|
||||
});
|
||||
}
|
||||
}
|
||||
parent: controlsContainer
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue