fix launcher fading out instead of sliding out
commitecbf938414edad2eebd7cede9cb9024ce84d69e7
authorMichael Zanetti <michael.zanetti@canonical.com>
dateThu 25 Sep 2014, 14:30 (12 years ago)
parent1cca366
qml/Launcher/Launcher.qml+1
@@ -92,6 +92,7 @@ Item {
9292 // machine and switch to the final state in the next event loop run
9393 Timer {
9494 id: animateTimer
95+ objectName: "animateTimer"
9596 interval: 1
9697 property string nextState: ""
9798 onTriggered: {
qml/Shell.qml−1
@@ -170,7 +170,6 @@ Item {
170170 lockscreen.show();
171171 }
172172 greeter.hide();
173− launcher.hide();
174173 }
175174
176175 onFocusedApplicationIdChanged: {
tests/qmltests/tst_Shell.qml+5
@@ -197,7 +197,12 @@ Row {
197197 }
198198
199199 var launcher = findChild(shell, "launcherPanel");
200+
200201 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");
201206 }
202207
203208 function test_suspend() {