Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-05 01:01:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wrap Items in Flickables so scrollbars will work - contents of flickable not showing up rn

Browse source
This commit is contained in:
Zach Fox 2019-10-03 12:55:02 -07:00
parent 1dd6aebede
commit 0e7dff05fb
1 changed files with 217 additions and 202 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,12 +58,18 @@ Rectangle {
id: tempAvatarPageContainer id: tempAvatarPageContainer
visible: true visible: true
GridLayout { Flickable {
id: tempAvatarPageGrid
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 50 anchors.leftMargin: 50
anchors.topMargin: 50 anchors.topMargin: 50
anchors.rightMargin: 100 anchors.rightMargin: 100
clip: true
contentWidth: parent.width
contentHeight: childrenRect.height
GridLayout {
id: tempAvatarPageGrid
anchors.fill: parent
columns: landscapeOrientation ? 2 : 1 columns: landscapeOrientation ? 2 : 1
rows: landscapeOrientation ? 1 : 2 rows: landscapeOrientation ? 1 : 2
@ -173,6 +179,7 @@ Rectangle {
} }
} }
} }
}
SimplifiedControls.VerticalScrollBar { SimplifiedControls.VerticalScrollBar {
parent: tempAvatarPageContainer parent: tempAvatarPageContainer
@ -184,9 +191,11 @@ Rectangle {
visible: false visible: false
anchors.fill: parent anchors.fill: parent
SimplifiedControls.VerticalScrollBar { Flickable {
parent: tempAvatarPageContainer anchors.fill: parent
} clip: true
contentWidth: parent.width
contentHeight: childrenRect.height
HifiStylesUit.RalewayRegular { HifiStylesUit.RalewayRegular {
id: controlsDescriptionText id: controlsDescriptionText
@ -296,6 +305,12 @@ Rectangle {
} }
} }
} }
}
SimplifiedControls.VerticalScrollBar {
parent: controlsContainer
}
} }
signal sendToScript(var message); signal sendToScript(var message);