32aee17 · unity8 · git.iko.soy

qml/Shell.qml+4−2

compare with xenial

unifiedsplit

@@ -454,8 +454,10 @@ Item {

454

455 if (!greeter.locked) {

456 dash.setCurrentScope(0, false, true);

457+ if (ApplicationManager.focusedApplicationId != "unity8-dash") {

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

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

458− launcher.fadeOut();

459+ launcher.fadeOut();

460+ }

459 }

461 }

460 }

462 }

461

463

runtests.sh+1−1

@@ -39,7 +39,7 @@ INOTIFYPID=`echo $!`

39

40sleep 1

41

42−cd -

42+cd builddir

43

44make -k qmltests

45

tests/qmltests/tst_Shell.qml+5−1

@@ -398,7 +398,7 @@ Rectangle {

398

399 {tag: "swipe over dash",

400 revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "unity8-dash",

401− launcherHides: true, greeterShown: false},

401+ launcherHides: false, greeterShown: false},

402 ];

403 }

404

@@ -608,6 +608,8 @@ Rectangle {

608

609 compare(dashCommunicatorSpy.count, 1);

610 compare(dashCommunicatorSpy.signalArguments[0][0], 0);

611+

612+ dashCommunicatorSpy.clear();

611 }

613 }

612

614

613 function test_showInputMethod() {

615 function test_showInputMethod() {

@@ -1109,6 +1111,8 @@ Rectangle {

1109 // check that the launcher got dismissed

1111 // check that the launcher got dismissed

1110 var launcherPanel = findChild(shell, "launcherPanel");

1112 var launcherPanel = findChild(shell, "launcherPanel");

1111 tryCompare(launcherPanel, "x", -launcherPanel.width);

1113 tryCompare(launcherPanel, "x", -launcherPanel.width);

1114+

1115+ launcherShowDashHomeSpy.clear();

1112 }

1116 }

1113

1117

1114 function test_background_data() {

1118 function test_background_data() {