git.iko.soy/unity8
on xenial help sign in
merge prereq
ff7002eMichael Zanetti
qml/Components/PhysicalKeysMapper.qml+4
compare with xenial
unifiedsplit
@@ -104,6 +104,10 @@ Item {
104 }
104 }
105 } else if (event.key == Qt.Key_Alt || (root.controlInsteadOfAlt && event.key == Qt.Key_Control)) {
105 } else if (event.key == Qt.Key_Alt || (root.controlInsteadOfAlt && event.key == Qt.Key_Control)) {
106 d.altPressed = true;
106 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.
107 } else if (((event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R) && event.modifiers === Qt.MetaModifier)
111 } 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)
112 || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)
109 ) {
113 ) {
tests/qmltests/tst_Shell.qml+1−1
@@ -2031,7 +2031,7 @@ Rectangle {
2031 tryCompare(launcherPanel, "highlightIndex", -2);
2031 tryCompare(launcherPanel, "highlightIndex", -2);
2032 tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
2032 tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
2033
2033
2034− // No go back to the dash
2034+ // Now go back to the dash
2035 keyPress(Qt.Key_Super_L, Qt.MetaModifier);
2035 keyPress(Qt.Key_Super_L, Qt.MetaModifier);
2036 keyClick(Qt.Key_Tab);
2036 keyClick(Qt.Key_Tab);
2037 tryCompare(launcher, "state", "visible");
2037 tryCompare(launcher, "state", "visible");