git.iko.soy/unity8
on xenial help sign in
Make changelog scrollable
c115db2Dalton Durst
qml/Wizard/Pages/11-changelog.qml+24−9
compare with xenial
unifiedsplit
@@ -30,22 +30,37 @@ LocalComponents.Page {
30 forwardButtonSourceComponent: forwardButton
30 forwardButtonSourceComponent: forwardButton
31 onlyOnUpdate: true
31 onlyOnUpdate: true
32
32
33−
33+ ScrollView {
34− Column {
34+ id: scroll
35− id: column
36− spacing: units.gu(2)
37
35
38 anchors {
36 anchors {
39 fill: content
37 fill: content
40 leftMargin: wideMode ? parent.leftMargin : staticMargin
38 leftMargin: wideMode ? parent.leftMargin : staticMargin
41 rightMargin: wideMode ? parent.rightMargin : staticMargin
39 rightMargin: wideMode ? parent.rightMargin : staticMargin
42− topMargin: staticMargin
43 }
40 }
44
41
42+ Column {
43+ id: column
44+
45+ width: scroll.width
46+
47+ // Make it appear that the text is hiding behind the header
48+ Item {
49+ height: staticMargin
50+ width: units.gu(1)
51+ }
52+
45− Label {
53+ Label {
54+ anchors {
55+ // Keep the scroll bar from interfering with text
56+ rightMargin: units.gu(1)
57+ }
58+ id: changelogText
46− width: parent.width
59+ width: parent.width
47− wrapMode: Text.WordWrap
60+ wrapMode: Text.WordWrap
61+ textSize: Label.Medium
48− text: Changelog.text
62+ text: Changelog.text
63+ }
49 }
64 }
50 }
65 }
51
66