git.iko.soy/unity8
on xenial help sign in
merge prereq
commitff7002e77e400485fa95b3121979a55ba29afd15 authorMichael Zanetti <michael.zanetti@canonical.com> dateTue 15 Dec 2015, 17:15 (11 years ago) parentfaa5c78776bde3
2 files changed+5−1
compare with xenial
unifiedsplit
qml/Components/PhysicalKeysMapper.qml+4 tests/qmltests/tst_Shell.qml+1−1
qml/Components/PhysicalKeysMapper.qml+4
@@ -104,6 +104,10 @@ Item {
104104 }
105105 } else if (event.key == Qt.Key_Alt || (root.controlInsteadOfAlt && event.key == Qt.Key_Control)) {
106106 d.altPressed = true;
107+
108+ // Adding MetaModifier here because that's what keyboards do. Pressing Super_L actually gives
109+ // Super_L + MetaModifier. This helps to make sure we only invoke superPressed if no other
110+ // Modifier is pressed too.
107111 } else if (((event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R) && event.modifiers === Qt.MetaModifier)
108112 || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)
109113 ) {
tests/qmltests/tst_Shell.qml+1−1
@@ -2031,7 +2031,7 @@ Rectangle {
20312031 tryCompare(launcherPanel, "highlightIndex", -2);
20322032 tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
20332033
2034− // No go back to the dash
2034+ // Now go back to the dash
20352035 keyPress(Qt.Key_Super_L, Qt.MetaModifier);
20362036 keyClick(Qt.Key_Tab);
20372037 tryCompare(launcher, "state", "visible");