git.iko.soy/unity8
on xenial help sign in
Logig is there
d365dfcJosh Arenson
qml/Greeter/SessionsList.qml+25−37
compare with xenial
unifiedsplit
@@ -25,8 +25,8 @@ Item {
25 objectName: "sessionsList"
25 objectName: "sessionsList"
26
26
27 property string initiallySelectedSession
27 property string initiallySelectedSession
28− //property alias selectedIndex: sessionsList.selectedIndex
29 signal sessionSelected(string sessionKey)
28 signal sessionSelected(string sessionKey)
29+ signal showLoginList()
30
30
31 LoginAreaContainer {
31 LoginAreaContainer {
32 height: units.gu(5) * sessionsList.model.count
32 height: units.gu(5) * sessionsList.model.count
@@ -40,8 +40,15 @@ Item {
40
40
41 UbuntuListView {
41 UbuntuListView {
42 id: sessionsList
42 id: sessionsList
43+
43− anchors.fill: parent
44+ anchors {
45+ top: parent.top
46+ left: parent.left
47+ right: parent.right
44− anchors.margins: units.gu(2)
48+ margins: units.gu(2)
49+ }
50+
51+ height: parent.height - currentItem.height
45
52
46 model: LightDMService.sessions
53 model: LightDMService.sessions
47 header: ListItemLayout {
54 header: ListItemLayout {
@@ -58,6 +65,11 @@ Item {
58 width: units.gu(3)
65 width: units.gu(3)
59 SlotsLayout.position: SlotsLayout.Leading
66 SlotsLayout.position: SlotsLayout.Leading
60 name: "go-previous"
67 name: "go-previous"
68+
69+ MouseArea {
70+ anchors.fill: parent
71+ onClicked: showLoginList()
72+ }
61 }
73 }
62 }
74 }
63
75
@@ -71,7 +83,6 @@ Item {
71 }
83 }
72
84
73 visible: sessionsList.currentItem.visible
85 visible: sessionsList.currentItem.visible
74− y: sessionsList.currentItem.y
75 }
86 }
76
87
77 delegate: ListItem {
88 delegate: ListItem {
@@ -81,12 +92,19 @@ Item {
81 visible: y > sessionsList.headerItem.y
92 visible: y > sessionsList.headerItem.y
82 + sessionsList.headerItem.height
93 + sessionsList.headerItem.height
83 - sessionsList.anchors.margins
94 - sessionsList.anchors.margins
84− && (y + height) < root.height
85
95
86− onYChanged: console.log("jam")
96+ /*property bool showHighlight: visible &&
97+ (sessionsList.currentIndex * height)
98+ - sessionsList.contentY
99+ < sessionsList.height + sessionsList.anchors.margins
100+ */
101+
87 MouseArea {
102 MouseArea {
88 anchors.fill: parent
103 anchors.fill: parent
104+ onClicked: {
89− onClicked: sessionsList.currentIndex = index
105+ sessionsList.currentIndex = index
106+ sessionSelected(key)
107+ }
90 }
108 }
91
109
92 ListItemLayout {
110 ListItemLayout {
@@ -104,35 +122,5 @@ Item {
104 }
122 }
105 }
123 }
106 }
124 }
107−
108− /*ItemSelector {
109− id: sessionsList
110− objectName: "sessionsListSelector"
111−
112− anchors.fill: parent
113− anchors.margins: units.dp(5)
114− clip: true
115− width: parent.width - units.gu(1)
116− expanded:true
117−
118− model: LightDMService.sessions
119− delegate: UnitySelectorDelegate {
120− objectName: "sessionDelegate" + index
121− colorImage: true
122− iconSource: icon_url
123− text: display
124−
125− // This matches the color for LoginList
126− assetColor: selected ? theme.palette.normal.backgroundText :
127− theme.palette.normal.raisedSecondaryText
128− textColor: selected ? theme.palette.normal.selectionText : theme.palette.normal.raisedText
129− selected: key === initiallySelectedSession
130− }
131−
132− onDelegateClicked: {
133− sessionSelected(sessionsList.model.data(index,
134− LightDMService.sessionRoles.KeyRole));
135− }
136− }*/
137 }
125 }
138}
126}
qml/Greeter/WideView.qml+2−1
@@ -223,10 +223,11 @@ FocusScope {
223 Connections {
223 Connections {
224 target: !loginListShown ? loginAreaLoader.item : null
224 target: !loginListShown ? loginAreaLoader.item : null
225 onSessionSelected: {
225 onSessionSelected: {
226− loginAreaLoader.loginListShown = true
227 loginAreaLoader.sessionUpdated = true
226 loginAreaLoader.sessionUpdated = true
228 loginAreaLoader.currentSession = sessionKey
227 loginAreaLoader.currentSession = sessionKey
229 }
228 }
229+
230+ onShowLoginList: loginAreaLoader.loginListShown = true
230 ignoreUnknownSignals: true
231 ignoreUnknownSignals: true
231 }
232 }
232 }
233 }