git.iko.soy/unity8
on xenial help sign in
Don't hide the launcher on super press if it's locked visible (LP: #1675373)

Approved by: Lukáš Tinkl, Unity8 CI Bot

commit14a6cd462a4c2650540bd85188b01650859cbe04 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 4 Apr 2017, 22:52 (10 years ago) parent40d05686623b1e
2 files changed+14−2
compare with xenial
unifiedsplit
qml/Launcher/Launcher.qml+2−2 tests/qmltests/Launcher/tst_Launcher.qml+12
qml/Launcher/Launcher.qml+2−2
@@ -75,7 +75,7 @@ FocusScope {
7575 } else {
7676 superPressTimer.stop();
7777 superLongPressTimer.stop();
78− switchToNextState("");
78+ switchToNextState(root.lockedVisible ? "visible" : "");
7979 panel.shortcutHintsShown = false;
8080 }
8181 }
@@ -88,7 +88,7 @@ FocusScope {
8888 superPressTimer.stop();
8989 superLongPressTimer.stop();
9090 } else {
91− switchToNextState("");
91+ switchToNextState(root.lockedVisible ? "visible" : "");
9292 root.focus = false;
9393 if (panel.highlightIndex == -1) {
9494 root.showDashHome();
tests/qmltests/Launcher/tst_Launcher.qml+12
@@ -1543,6 +1543,18 @@ Rectangle {
15431543 launcher.panelWidth = oldSize;
15441544 }
15451545
1546+ function test_doesntHideOnSuperWhenLockedVisible() {
1547+ launcher.lockedVisible = true;
1548+
1549+ waitForRendering(launcher);
1550+ launcher.superPressed = true;
1551+ wait(400); // Longpress
1552+ launcher.superPressed = false;
1553+ waitForRendering(launcher);
1554+
1555+ verify(launcher.state, "visible");
1556+ }
1557+
15461558 function test_mouseHoverSelectQuickList() {
15471559 dragLauncherIntoView();
15481560 var clickedItem = findChild(launcher, "launcherDelegate5")