git.iko.soy/unity8
on xenial help sign in
fix launcher fading out instead of sliding out
ecbf938Michael Zanetti
qml/Launcher/Launcher.qml+1
compare with xenial
unifiedsplit
@@ -92,6 +92,7 @@ Item {
92 // machine and switch to the final state in the next event loop run
92 // machine and switch to the final state in the next event loop run
93 Timer {
93 Timer {
94 id: animateTimer
94 id: animateTimer
95+ objectName: "animateTimer"
95 interval: 1
96 interval: 1
96 property string nextState: ""
97 property string nextState: ""
97 onTriggered: {
98 onTriggered: {
qml/Shell.qml−1
@@ -170,7 +170,6 @@ Item {
170 lockscreen.show();
170 lockscreen.show();
171 }
171 }
172 greeter.hide();
172 greeter.hide();
173− launcher.hide();
174 }
173 }
175
174
176 onFocusedApplicationIdChanged: {
175 onFocusedApplicationIdChanged: {
tests/qmltests/tst_Shell.qml+5
@@ -197,7 +197,12 @@ Row {
197 }
197 }
198
198
199 var launcher = findChild(shell, "launcherPanel");
199 var launcher = findChild(shell, "launcherPanel");
200+
200 tryCompare(launcher, "x", data.launcherHides ? -launcher.width : 0)
201 tryCompare(launcher, "x", data.launcherHides ? -launcher.width : 0)
202+
203+ // Make sure the helper for sliding out the launcher wasn't touched. We want to fade it out here.
204+ var animateTimer = findInvisibleChild(shell, "animateTimer");
205+ compare(animateTimer.nextState, "visible");
201 }
206 }
202
207
203 function test_suspend() {
208 function test_suspend() {