git.iko.soy/unity8
on xenial help sign in
merge prereq
commitfaa5c78bcc8955668e564dabf3a58e91d5a46b5f authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 15 Dec 2015, 17:14 (11 years ago) parentad89819bcd0928
2 files changed+10−7
compare with xenial
unifiedsplit
qml/Components/PhysicalKeysMapper.qml+3−1 tests/qmltests/tst_Shell.qml+7−6
qml/Components/PhysicalKeysMapper.qml+3−1
@@ -104,7 +104,9 @@ Item {
104104 }
105105 } else if (event.key == Qt.Key_Alt || (root.controlInsteadOfAlt && event.key == Qt.Key_Control)) {
106106 d.altPressed = true;
107− } else if (event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)) {
107+ } else if (((event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R) && event.modifiers === Qt.MetaModifier)
108+ || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)
109+ ) {
108110 d.superPressed = true;
109111 } else if (event.key == Qt.Key_Tab) {
110112 if (d.altPressed && !d.altTabPressed) {
tests/qmltests/tst_Shell.qml+7−6
@@ -2018,24 +2018,25 @@ Rectangle {
20182018 compare(launcherPanel.highlightIndex, -2);
20192019 compare(ApplicationManager.focusedApplicationId, "unity8-dash");
20202020
2021+ wait(2000)
20212022 // Use Super + Tab Tab to cycle to the first entry in the launcher
2022− keyPress(Qt.Key_Super_L);
2023+ keyPress(Qt.Key_Super_L, Qt.MetaModifier);
20232024 keyClick(Qt.Key_Tab);
20242025 tryCompare(launcher, "state", "visible");
20252026 tryCompare(launcherPanel, "highlightIndex", -1);
20262027 keyClick(Qt.Key_Tab);
20272028 tryCompare(launcherPanel, "highlightIndex", 0);
2028− keyRelease(Qt.Key_Super_L);
2029+ keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
20292030 tryCompare(launcher, "state", data.launcherLocked ? "visible" : "");
20302031 tryCompare(launcherPanel, "highlightIndex", -2);
20312032 tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
20322033
20332034 // No go back to the dash
2034− keyPress(Qt.Key_Super_L);
2035+ keyPress(Qt.Key_Super_L, Qt.MetaModifier);
20352036 keyClick(Qt.Key_Tab);
20362037 tryCompare(launcher, "state", "visible");
20372038 tryCompare(launcherPanel, "highlightIndex", -1);
2038− keyRelease(Qt.Key_Super_L);
2039+ keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
20392040 tryCompare(launcher, "state", data.launcherLocked ? "visible" : "");
20402041 tryCompare(launcherPanel, "highlightIndex", -2);
20412042 tryCompare(ApplicationManager, "focusedApplicationId", "unity8-dash");
@@ -2047,11 +2048,11 @@ Rectangle {
20472048 var shortcutHint = findChild(findChild(launcher, "launcherDelegate0"), "shortcutHint")
20482049
20492050 compare(launcher.state, "");
2050− keyPress(Qt.Key_Super_L);
2051+ keyPress(Qt.Key_Super_L, Qt.MetaModifier);
20512052 tryCompare(launcher, "state", "visible");
20522053 tryCompare(shortcutHint, "visible", true);
20532054
2054− keyRelease(Qt.Key_Super_L);
2055+ keyRelease(Qt.Key_Super_L, Qt.MetaModifier);
20552056 tryCompare(launcher, "state", "");
20562057 tryCompare(shortcutHint, "visible", false);
20572058 }