5c06c0d · unity8 · git.iko.soy

on xenial help sign in

Fix height issue

5c06c0dJosh Arenson10 years ago

qml/Greeter/SessionsList.qml+5−5

@@ -29,13 +29,13 @@ Item {

29 signal showLoginList()

31 LoginAreaContainer {

32− readonly property real maxHeight: {

32+ readonly property real margins: sessionsList.anchors.margins

33+ readonly property real prefferedHeight: {

33− (sessionsList.currentItem.height * sessionsList.model.count) +

34+ ((sessionsList.currentItem.height + margins) * sessionsList.model.count) +

34− (sessionsList.headerItem.height + sessionsList.anchors.margins) -

35+ sessionsList.headerItem.height + margins

35− units.gu(4) //some margins

36 }

38− height: maxHeight < parent.height ? maxHeight : parent.height - units.gu(4)

38+ height: prefferedHeight < parent.height ? prefferedHeight : parent.height - units.gu(4)

39 width: parent.width

41 anchors {

tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+5−5

@@ -47,16 +47,16 @@ void SessionsModelPrivate::resetEntries_multipleSessions()

47 sessionItems =

48 {

49 {"ubuntu", "", "Ubuntu", ""},

50− {"ubuntu-2d", "", "Ubuntu 2D", ""},

50+ {"ubuntu-2d", "", "Ubuntu 2D", ""}

51− {"gnome", "", "GNOME", ""},

51+ /*{"gnome", "", "GNOME", ""},

52− {"gnome-classic", "", "GNOME Classic", ""},

52+ //{"gnome-classic", "", "GNOME Classic", ""},

53− {"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},

53+ //{"gnome-flashback-compiz", "", "GNOME Flashback (Compiz)", ""},

54 {"gnome-flashback-metacity", "", "GNOME Flashback (Metacity)", ""},

55 {"gnome-wayland", "", "GNOME on Wayland", ""},

56 {"plasma", "", "Plasma", ""},

57 {"kde", "", "KDE" , ""},

58 {"xterm", "", "Recovery Console", ""},

59− {"", "", "Unknown?", ""}

59+ {"", "", "Unknown?", ""}*/

60 };

61}