git.iko.soy/unity8
on xenial help sign in
Merge fixes
b094da6Josh Arenson
qml/Greeter/LoginList.qml+48−43
compare with xenial
unifiedsplit
@@ -116,49 +116,6 @@ StyledItem {
116 }
116 }
117
117
118 height: root.highlightedHeight
118 height: root.highlightedHeight
119−
120− z: sessionChooser.visible ? userList.z + 1 : z
121−
122− // Use an AbstractButton due to icon limitations with Button
123− AbstractButton {
124− id: sessionChooser
125− objectName: "sessionChooserButton"
126−
127− readonly property alias icon: badge.source
128−
129− visible: LightDMService.sessions.count > 1 &&
130− LightDMService.greeter.locked
131−
132− height: units.gu(2.5)
133− width: units.gu(2.5)
134−
135− anchors {
136− right: parent.right
137− rightMargin: units.gu(1)
138−
139− top: parent.top
140− topMargin: units.gu(1)
141− }
142−
143− Image {
144− id: badge
145− anchors.fill: parent
146− source: LightDMService.sessions.iconUrl(root.currentSession)
147− }
148−
149− onClicked: {
150− sessionChooserButtonClicked();
151− }
152−
153− // Refresh the icon path if looking at different places at runtime
154− // this is mainly for testing
155− Connections {
156− target: LightDMService.sessions
157− onIconSearchDirectoriesChanged: {
158− badge.source = LightDMService.sessions.iconUrl(root.currentSession)
159− }
160− }
161− }
162 }
119 }
163
120
164 ListView {
121 ListView {
@@ -258,6 +215,54 @@ StyledItem {
258 }
215 }
259 }
216 }
260
217
218+ // Use an AbstractButton due to icon limitations with Button
219+ AbstractButton {
220+ id: sessionChooser
221+ objectName: "sessionChooserButton"
222+
223+ readonly property alias icon: badge.source
224+
225+ visible: LightDMService.sessions.count > 1 &&
226+ LightDMService.greeter.locked
227+
228+ height: units.gu(3)
229+ width: units.gu(3)
230+
231+ anchors {
232+ right: highlightItem.right
233+ rightMargin: units.gu(2)
234+
235+ top: highlightItem.top
236+ topMargin: units.gu(1.5)
237+ }
238+
239+ Icon {
240+ id: badge
241+ anchors.fill: parent
242+ keyColor: "#ffffff" // icon providers give us white icons
243+ color: theme.palette.normal.raisedSecondaryText
244+ source: LightDMService.sessions.iconUrl(root.currentSession)
245+ }
246+
247+ Component.onCompleted: {
248+ console.log("JOSH-> count: " + LightDMService.sessions.count);
249+ console.log("JOSH-> visible: " + visible)
250+ }
251+
252+ onClicked: {
253+ sessionChooserButtonClicked();
254+ }
255+
256+ // Refresh the icon path if looking at different places at runtime
257+ // this is mainly for testing
258+ Connections {
259+ target: LightDMService.sessions
260+ onIconSearchDirectoriesChanged: {
261+ badge.source = LightDMService.sessions.iconUrl(root.currentSession)
262+ }
263+ }
264+ }
265+
261 FadingLabel {
266 FadingLabel {
262 id: infoLabel
267 id: infoLabel
263 objectName: "infoLabel"
268 objectName: "infoLabel"
qml/Greeter/WideView.qml+6−2
@@ -148,9 +148,13 @@ FocusScope {
148 leftMargin: Math.min(parent.width * 0.16, units.gu(20))
148 leftMargin: Math.min(parent.width * 0.16, units.gu(20))
149 top: parent.top
149 top: parent.top
150 }
150 }
151+
151 width: units.gu(40)
152 width: units.gu(40)
153+ height: inputMethod && inputMethod.visible ?
152− height: inputMethod && inputMethod.visible ? parent.height - inputMethod.keyboardRectangle.height
154+ parent.height - inputMethod.keyboardRectangle.height : parent.height
153− : parent.height
155+
156+ Behavior on height { UbuntuNumberAnimation {} }
157+
154 UbuntuNumberAnimation {
158 UbuntuNumberAnimation {
155 id: loadingAnimation
159 id: loadingAnimation
156 target: loginAreaLoader.item
160 target: loginAreaLoader.item