git.iko.soy/unity8
on xenial help sign in
Handle 0 sessions better
commit78b9a2f3f663401847f80574952beb9bd5dfa15a authorJosh Arenson <joshua.arenson@canonical.com> dateWed 13 Jul 2016, 13:30 (10 years ago) parentc09e2b9
2 files changed+7−6
compare with xenial
unifiedsplit
qml/Greeter/SessionsList.qml+6−2 tests/qmltests/Greeter/tst_WideView.qml+1−4
qml/Greeter/SessionsList.qml+6−2
@@ -45,8 +45,12 @@ Item {
4545 LoginAreaContainer {
4646 readonly property real margins: sessionsList.anchors.margins
4747 readonly property real prefferedHeight: {
48− ((sessionsList.currentItem.height + margins) * sessionsList.model.count) +
49− sessionsList.headerItem.height + margins
48+ if (sessionsList.currentItem) {
49+ return ((sessionsList.currentItem.height + margins) *
50+ sessionsList.model.count) + sessionsList.headerItem.height + margins
51+ } else {
52+ return sessionsList.headerItem.height + margins
53+ }
5054 }
5155
5256 height: prefferedHeight < parent.height ? prefferedHeight : parent.height - units.gu(4)
tests/qmltests/Greeter/tst_WideView.qml+1−4
@@ -25,8 +25,6 @@ import Unity.Test 0.1 as UT
2525StyledItem {
2626 id: root
2727
28− property int numSessions: LightDM.Sessions.numSessions
29−
3028 width: units.gu(120)
3129 height: units.gu(80)
3230
@@ -281,14 +279,13 @@ StyledItem {
281279 }
282280 }
283281 Row {
284− id: numSessions
285282 Slider {
286283 id: numSessionsSlider
287284
288285 width: units.gu(10)
289286 minimumValue: 0
290287 maximumValue: LightDM.Sessions.numAvailableSessions
291− value: root.numSessions
288+ value: LightDM.Sessions.numSessions
292289 visible: LightDM.Sessions.testScenario === "multipleSessions"
293290 Binding {
294291 target: LightDM.Sessions