git.iko.soy/unity8
on xenial help sign in
Fix infographics
a8fa083Capsia
qml/Greeter/CoverPage.qml+17−10
compare with xenial
unifiedsplit
@@ -34,7 +34,7 @@ Showable {
34 property var infographicModel
34 property var infographicModel
35 property bool draggable: true
35 property bool draggable: true
36
36
37− property alias showInfographic: infographicsLoader.active
37+ property bool showInfographic: false
38 property real infographicsLeftMargin: 0
38 property real infographicsLeftMargin: 0
39 property real infographicsTopMargin: 0
39 property real infographicsTopMargin: 0
40 property real infographicsRightMargin: 0
40 property real infographicsRightMargin: 0
@@ -108,15 +108,8 @@ Showable {
108 visible: false
108 visible: false
109 }
109 }
110
110
111− Loader {
111+ Item {
112− id: infographicsLoader
112+ id: infographicsArea
113− objectName: "infographicsLoader"
114− sourceComponent:Infographics {
115− id: infographics
116− objectName: "infographics"
117− model: root.infographicModel
118− clip: true // clip large data bubbles
119− }
120
113
121 anchors {
114 anchors {
122 leftMargin: root.infographicsLeftMargin
115 leftMargin: root.infographicsLeftMargin
@@ -130,6 +123,20 @@ Showable {
130 }
123 }
131 }
124 }
132
125
126+ Loader {
127+ id: infographicsLoader
128+ objectName: "infographicsLoader"
129+ active: root.showInfographic && infographicsArea.width > units.gu(32)
130+ anchors.fill: infographicsArea
131+
132+ sourceComponent:Infographics {
133+ id: infographics
134+ objectName: "infographics"
135+ model: root.infographicModel
136+ clip: true // clip large data bubbles
137+ }
138+ }
139+
133 Label {
140 Label {
134 id: swipeHint
141 id: swipeHint
135 objectName: "swipeHint"
142 objectName: "swipeHint"
qml/Greeter/GreeterView.qml+2−2
@@ -138,7 +138,7 @@ FocusScope {
138 hasCustomBackground: root.hasCustomBackground
138 hasCustomBackground: root.hasCustomBackground
139 backgroundShadeOpacity: 0.6
139 backgroundShadeOpacity: 0.6
140
140
141− showInfographic: root.usageMode != "phone" && isLandscape && !delayedLockscreen.visible
141+ showInfographic: isLandscape && root.usageMode != "phone" && (root.usageMode != "tablet" || root.multiUser) && !delayedLockscreen.visible
142 infographicModel: root.infographicModel
142 infographicModel: root.infographicModel
143
143
144 shown: false
144 shown: false
@@ -355,7 +355,7 @@ FocusScope {
355 backgroundSourceSize: root.backgroundSourceSize
355 backgroundSourceSize: root.backgroundSourceSize
356 infographicModel: root.infographicModel
356 infographicModel: root.infographicModel
357
357
358− showInfographic: !root.multiUser && (!isLandscape || root.usageMode == "phone")
358+ showInfographic: !root.multiUser && root.usageMode != "desktop"
359
359
360 onShowProgressChanged: {
360 onShowProgressChanged: {
361 if (showProgress === 0) {
361 if (showProgress === 0) {
tests/qmltests/Greeter/tst_GreeterView.qml+2−2
@@ -1295,8 +1295,8 @@ StyledItem {
1295 multiUser: false,
1295 multiUser: false,
1296 usageMode: "tablet",
1296 usageMode: "tablet",
1297 orientation: Qt.LandscapeOrientation,
1297 orientation: Qt.LandscapeOrientation,
1298− coverPage: false,
1298+ coverPage: true,
1299− lockscreen: true
1299+ lockscreen: false
1300 },
1300 },
1301 {
1301 {
1302 tag: "tablet-landscape-multiuser",
1302 tag: "tablet-landscape-multiuser",