git.iko.soy/unity8
on xenial help sign in
fix/add comments
776bde3Michael 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
@@ -1997,7 +1997,7 @@ Rectangle {
1997 tryCompare(launcherPanel, "highlightIndex", -2);
1997 tryCompare(launcherPanel, "highlightIndex", -2);
1998 tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
1998 tryCompare(ApplicationManager, "focusedApplicationId", firstAppInLauncher);
1999
1999
2000− // No go back to the dash
2000+ // Now go back to the dash
2001 keyPress(Qt.Key_Super_L, Qt.MetaModifier);
2001 keyPress(Qt.Key_Super_L, Qt.MetaModifier);
2002 keyClick(Qt.Key_Tab);
2002 keyClick(Qt.Key_Tab);
2003 tryCompare(launcher, "state", "visible");
2003 tryCompare(launcher, "state", "visible");