git.iko.soy/unity8
on xenial help sign in
resume the behaviour in 'swipe over dash'
commit32aee17e83d32ebe2952dc97b2bad69537f31458 authorhandsome_feng <445865575@qq.com> dateMon 4 May 2015, 12:00 (11 years ago) parent8bd86b2
3 files changed+10−4
compare with xenial
unifiedsplit
qml/Shell.qml+4−2 runtests.sh+1−1 tests/qmltests/tst_Shell.qml+5−1
qml/Shell.qml+4−2
@@ -454,8 +454,10 @@ Item {
454454
455455 if (!greeter.locked) {
456456 dash.setCurrentScope(0, false, true);
457− ApplicationManager.requestFocusApplication("unity8-dash");
458− launcher.fadeOut();
457+ if (ApplicationManager.focusedApplicationId != "unity8-dash") {
458+ ApplicationManager.requestFocusApplication("unity8-dash");
459+ launcher.fadeOut();
460+ }
459461 }
460462 }
461463
runtests.sh+1−1
@@ -39,7 +39,7 @@ INOTIFYPID=`echo $!`
3939
4040sleep 1
4141
42−cd -
42+cd builddir
4343
4444make -k qmltests
4545
tests/qmltests/tst_Shell.qml+5−1
@@ -398,7 +398,7 @@ Rectangle {
398398
399399 {tag: "swipe over dash",
400400 revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "unity8-dash",
401− launcherHides: true, greeterShown: false},
401+ launcherHides: false, greeterShown: false},
402402 ];
403403 }
404404
@@ -608,6 +608,8 @@ Rectangle {
608608
609609 compare(dashCommunicatorSpy.count, 1);
610610 compare(dashCommunicatorSpy.signalArguments[0][0], 0);
611+
612+ dashCommunicatorSpy.clear();
611613 }
612614
613615 function test_showInputMethod() {
@@ -1109,6 +1111,8 @@ Rectangle {
11091111 // check that the launcher got dismissed
11101112 var launcherPanel = findChild(shell, "launcherPanel");
11111113 tryCompare(launcherPanel, "x", -launcherPanel.width);
1114+
1115+ launcherShowDashHomeSpy.clear();
11121116 }
11131117
11141118 function test_background_data() {