git.iko.soy/unity8
on xenial help sign in
Merge from greeter-ux-fixes
6f2b997Michael Terry
qml/Greeter/Greeter.qml+2
compare with xenial
unifiedsplit
@@ -205,6 +205,7 @@ Showable {
205 anchors.left: parent.right
205 anchors.left: parent.right
206 anchors.top: parent.top
206 anchors.top: parent.top
207 anchors.bottom: parent.bottom
207 anchors.bottom: parent.bottom
208+ visible: parent.visible
208 fillMode: Image.Tile
209 fillMode: Image.Tile
209 source: "../graphics/dropshadow_right.png"
210 source: "../graphics/dropshadow_right.png"
210 }
211 }
@@ -214,6 +215,7 @@ Showable {
214 anchors.right: parent.left
215 anchors.right: parent.left
215 anchors.top: parent.top
216 anchors.top: parent.top
216 anchors.bottom: parent.bottom
217 anchors.bottom: parent.bottom
218+ visible: parent.visible
217 fillMode: Image.Tile
219 fillMode: Image.Tile
218 source: "../graphics/dropshadow_left.png"
220 source: "../graphics/dropshadow_left.png"
219 }
221 }
qml/GreeterShell.qml+9−7
@@ -98,18 +98,22 @@ BasicShell {
98 }
98 }
99 }
99 }
100
100
101+ Rectangle {
102+ anchors.fill: parent
103+ color: "black"
104+ opacity: greeterWrapper.showProgress * 0.8
105+ }
106+
101 Item {
107 Item {
102 // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
108 // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
109+ id: greeterWrapper
103 width: parent.width
110 width: parent.width
104 height: parent.height
111 height: parent.height
105 x: launcher.progress
112 x: launcher.progress
106 Behavior on x {SmoothedAnimation{velocity: 600}}
113 Behavior on x {SmoothedAnimation{velocity: 600}}
107
114
108− Rectangle {
115+ readonly property real showProgress: x === 0 ? greeter.showProgress : (1 - x/width)
109− anchors.fill: parent
116+ onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
110− color: "black"
111− opacity: (1 - Math.abs(greeter.x) / shell.width) * 0.8
112− }
113
117
114 Greeter {
118 Greeter {
115 id: greeter
119 id: greeter
@@ -143,8 +147,6 @@ BasicShell {
143 }
147 }
144 }
148 }
145
149
146− onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress == 0) login()
147−
148 onUnlocked: login()
150 onUnlocked: login()
149 onSelected: {
151 onSelected: {
150 // Update launcher items for new user
152 // Update launcher items for new user