git.iko.soy/unity8
on xenial help sign in
Fix height issue
commit5c06c0de9c08edd4e08be6b7b0dbd24daf1119e2 authorJosh Arenson <joshua.arenson@canonical.com> dateThu 7 Jul 2016, 11:58 (10 years ago) parent1b334c6
2 files changed+10−10
compare with xenial
unifiedsplit
qml/Greeter/SessionsList.qml+5−5 tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+5−5
qml/Greeter/SessionsList.qml+5−5
@@ -29,13 +29,13 @@ Item {
2929 signal showLoginList()
3030
3131 LoginAreaContainer {
32− readonly property real maxHeight: {
33− (sessionsList.currentItem.height * sessionsList.model.count) +
34− (sessionsList.headerItem.height + sessionsList.anchors.margins) -
35− units.gu(4) //some margins
32+ readonly property real margins: sessionsList.anchors.margins
33+ readonly property real prefferedHeight: {
34+ ((sessionsList.currentItem.height + margins) * sessionsList.model.count) +
35+ sessionsList.headerItem.height + margins
3636 }
3737
38− height: maxHeight < parent.height ? maxHeight : parent.height - units.gu(4)
38+ height: prefferedHeight < parent.height ? prefferedHeight : parent.height - units.gu(4)
3939 width: parent.width
4040
4141 anchors {
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+5−5
@@ -47,16 +47,16 @@ void SessionsModelPrivate::resetEntries_multipleSessions()
4747 sessionItems =
4848 {
4949 {"ubuntu", "", "Ubuntu", ""},
50− {"ubuntu-2d", "", "Ubuntu 2D", ""},
51− {"gnome", "", "GNOME", ""},
52− {"gnome-classic", "", "GNOME Classic", ""},
53− {"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},
50+ {"ubuntu-2d", "", "Ubuntu 2D", ""}
51+ /*{"gnome", "", "GNOME", ""},
52+ //{"gnome-classic", "", "GNOME Classic", ""},
53+ //{"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},
5454 {"gnome-flashback-metacity", "", "GNOME Flashback (Metacity)", ""},
5555 {"gnome-wayland", "", "GNOME on Wayland", ""},
5656 {"plasma", "", "Plasma", ""},
5757 {"kde", "", "KDE" , ""},
5858 {"xterm", "", "Recovery Console", ""},
59− {"", "", "Unknown?", ""}
59+ {"", "", "Unknown?", ""}*/
6060 };
6161}
6262