@@ -41,14 +41,14 @@ Item {
4141 signal screenshotTriggered;
4242
4343 readonly property bool altTabPressed: d.altTabPressed
44− readonly property bool metaTabPressed: d.metaTabPressed
44+ readonly property bool superTabPressed: d.superTabPressed
4545
4646 property int powerKeyLongPressTime: 2000
4747
4848 // For testing. If running windowed (e.g. tryShell), Alt+Tab is taken by the
4949 // running desktop, set this to true to use Ctrl+Tab instead.
5050 property bool controlInsteadOfAlt: false
51− property bool controlInsteadOfMeta: false
51+ property bool controlInsteadOfSuper: false
5252
5353 QtObject {
5454 id: d
@@ -60,14 +60,14 @@ Item {
6060 property bool altPressed: false
6161 property bool altTabPressed: false
6262
63− property bool metaPressed: false
64− property bool metaTabPressed: false
63+ property bool superPressed: false
64+ property bool superTabPressed: false
6565
6666 property var powerButtonPressStart: 0
6767 }
6868
6969 function onKeyPressed(event, currentEventTimestamp) {
70− print("key pressed", event.key, Qt.Key_Tab)
70+ print("key pressed", event.key, "Tab is", Qt.Key_Tab, "Meta is", Qt.Key_Meta)
7171 if (event.key == Qt.Key_PowerDown || event.key == Qt.Key_PowerOff) {
7272 if (event.isAutoRepeat) {
7373 if (d.powerButtonPressStart > 0
@@ -104,18 +104,18 @@ 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_Meta || (root.controlInsteadOfMeta && event.key == Qt.Key_Control)) {
107+ } else if (event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)) {
108108 print("meta pressed")
109− d.metaPressed = true;
109+ d.superPressed = true;
110110 } else if (event.key == Qt.Key_Tab) {
111111 if (d.altPressed && !d.altTabPressed) {
112112 d.altTabPressed = true;
113113 event.accepted = true;
114114 }
115− print("huh", d.metaPressed)
116− if (d.metaPressed && !d.metaTabPressed) {
117− print("metaTab pressed")
118− d.metaTabPressed = true;
115+ print("huh", d.superPressed, d.superTabPressed)
116+ if (d.superPressed && !d.superTabPressed) {
117+ print("superTab pressed")
118+ d.superTabPressed = true;
119119 event.accepted = true;
120120 }
121121 }
@@ -139,10 +139,10 @@ Item {
139139 d.altTabPressed = false;
140140 event.accepted = true;
141141 }
142− } else if (event.key == Qt.Key_Meta || (root.controlInsteadOfMeta && event.key == Qt.Key_Control)) {
143− d.metaPressed = false;
144− if (d.metaTabPressed) {
145− d.metaTabPressed = false;
142+ } else if (event.key == Qt.Key_Super_L || event.key == Qt.Key_Super_R || (root.controlInsteadOfSuper && event.key == Qt.Key_Control)) {
143+ d.superPressed = false;
144+ if (d.superTabPressed) {
145+ d.superTabPressed = false;
146146 event.accepted = true;
147147 }
148148 }