2fb6eee · unity8 · git.iko.soy

long swipe goes to apps scope only when the focused app is not unity8-dash

commit2fb6eeef30c4841008daa2ffeddd46c25cc8d6f0 authorhandsome_feng <445865575@qq.com> dateFri 22 May 2015, 10:17 (11 years ago) parent91b6761

2 files changed+9−6

unifiedsplit

qml/Shell.qml+4−6

@@ -455,12 +455,10 @@ Item {

455455 launcher.fadeOut();

456456 }

457457

458− if (!greeter.locked) {

459− dash.setCurrentScope(0, true, true);

460− if (ApplicationManager.focusedApplicationId != "unity8-dash") {

461− ApplicationManager.requestFocusApplication("unity8-dash");

462− launcher.fadeOut();

463− }

458+ if (!greeter.locked && ApplicationManager.focusedApplicationId != "unity8-dash") {

459+ dash.setCurrentScope(0, false, true);

460+ ApplicationManager.requestFocusApplication("unity8-dash");

461+ launcher.fadeOut();

464462 }

465463 }

466464

tests/qmltests/tst_Shell.qml+5

@@ -463,6 +463,11 @@ Rectangle {

463463 function test_longLeftEdgeSwipeTakesToAppsAndResetSearchString() {

464464 loadShell("phone");

465465 swipeAwayGreeter();

466+ dragLauncherIntoView();

467+ tapOnAppIconInLauncher();

468+ waitUntilApplicationWindowIsFullyVisible();

469+

470+ verify(ApplicationManager.focusedApplicationId !== "unity8-dash")

466471

467472 dashCommunicatorSpy.clear();

468473