fix fading out the launcher instead of sliding it out on left-edge minimizing an app.
On left edge swipes, when there's an app other then the dash focused, we need to fade out instead of slide out to prevent the counter movement. This has been working already but changes in Shell.qml added a call to hide() too which made it fade out and slide to the left. This commit removes that bogus hide() call and adds a regression for it.
This situation should only happen on left edge swipes, in all other cases of switching app focus, the launcher should either slide away, or is already hidden.
Approved by: Albert Astals Cid
commitaec74acf57c5e7d5cd4ddeb7b09d8c0448801ebd
authorMichael Zanetti <michael.zanetti@canonical.com>
dateMon 6 Oct 2014, 07:59 (12 years ago)
parent69598faaf9b60b
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+4
@@ -198,6 +198,10 @@ Row {
198198
199199 var launcher = findChild(shell, "launcherPanel");
200200 tryCompare(launcher, "x", data.launcherHides ? -launcher.width : 0)
201+
202+ // Make sure the helper for sliding out the launcher wasn't touched. We want to fade it out here.
203+ var animateTimer = findInvisibleChild(shell, "animateTimer");
204+ compare(animateTimer.nextState, "visible");
201205 }
202206
203207 function test_suspend() {