git.iko.soy/unity8
on xenial help sign in
Shell.qml: Move the new Key event handlers to WindowKeysFilter
429c7cfDaniel d'Andrada
qml/Shell.qml+20−16
compare with xenial
unifiedsplit
@@ -91,6 +91,26 @@ Item {
91 // Handle but do not filter out volume keys
91 // Handle but do not filter out volume keys
92 Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }
92 Keys.onVolumeUpPressed: { volumeControl.volumeUp(); event.accepted = false; }
93 Keys.onVolumeDownPressed: { volumeControl.volumeDown(); event.accepted = false; }
93 Keys.onVolumeDownPressed: { volumeControl.volumeDown(); event.accepted = false; }
94+
95+ Keys.onPressed: {
96+ if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
97+ if (!powerKeyTimer.running) {
98+ powerKeyTimer.start();
99+ }
100+ event.accepted = true;
101+ } else {
102+ event.accepted = false;
103+ }
104+ }
105+
106+ Keys.onReleased: {
107+ if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
108+ powerKeyTimer.stop();
109+ event.accepted = true;
110+ } else {
111+ event.accepted = false;
112+ }
113+ }
94 }
114 }
95
115
96 Item {
116 Item {
@@ -766,22 +786,6 @@ Item {
766 onShowHome: showHome()
786 onShowHome: showHome()
767 }
787 }
768
788
769− Keys.onPressed: {
770− if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
771− if (!powerKeyTimer.running) {
772− powerKeyTimer.start();
773− }
774− event.accepted = true;
775− }
776− }
777−
778− Keys.onReleased: {
779− if (event.key == Qt.Key_PowerOff || event.key == Qt.Key_PowerDown) {
780− powerKeyTimer.stop();
781− event.accepted = true;
782− }
783− }
784−
785 Timer {
789 Timer {
786 id: powerKeyTimer
790 id: powerKeyTimer
787 interval: 2000
791 interval: 2000