git.iko.soy/unity8
on xenial help sign in
Remove eventAccepted from PhysicalKeysMapper
16ab87bJosh Arenson
qml/Components/PhysicalKeysMapper.qml−12
compare with xenial
unifiedsplit
@@ -39,8 +39,6 @@ QtObject {
39 signal volumeDownPressed();
39 signal volumeDownPressed();
40 signal volumeUpPressed();
40 signal volumeUpPressed();
41
41
42− property bool eventAccepted: false
43−
44 property bool aPowerKeyWasReleased: true
42 property bool aPowerKeyWasReleased: true
45 property bool powerKeyPressed: false
43 property bool powerKeyPressed: false
46
44
@@ -67,13 +65,10 @@ QtObject {
67 if (!powerKeyLongPressTimer.running) {
65 if (!powerKeyLongPressTimer.running) {
68 powerKeyLongPressTimer.restart();
66 powerKeyLongPressTimer.restart();
69 }
67 }
70− eventAccepted = true;
71 powerKeyPressed = true;
68 powerKeyPressed = true;
72 } else if (key == Qt.Key_VolumeDown) {
69 } else if (key == Qt.Key_VolumeDown) {
73− eventAccepted = true;
74 volumeDownKeyPressed = true;
70 volumeDownKeyPressed = true;
75 } else if (key == Qt.Key_VolumeUp) {
71 } else if (key == Qt.Key_VolumeUp) {
76− eventAccepted = true;
77 volumeUpKeyPressed = true;
72 volumeUpKeyPressed = true;
78 }
73 }
79
74
@@ -94,26 +89,19 @@ QtObject {
94 } else if (volumeUpKeyPressed) {
89 } else if (volumeUpKeyPressed) {
95 volumeUpPressed();
90 volumeUpPressed();
96 }
91 }
97−
98− return eventAccepted;
99 }
92 }
100
93
101 function onKeyReleased(key) {
94 function onKeyReleased(key) {
102 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
95 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
103 powerKeyLongPressTimer.stop();
96 powerKeyLongPressTimer.stop();
104− eventAccepted = true;
105 powerKeyPressed = false;
97 powerKeyPressed = false;
106 aPowerKeyWasReleased = true;
98 aPowerKeyWasReleased = true;
107 } else if (key == Qt.Key_VolumeDown) {
99 } else if (key == Qt.Key_VolumeDown) {
108− eventAccepted = true;
109 volumeDownKeyPressed = false;
100 volumeDownKeyPressed = false;
110 aVolumeKeyWasReleased = false;
101 aVolumeKeyWasReleased = false;
111 } else if (key == Qt.Key_VolumeUp) {
102 } else if (key == Qt.Key_VolumeUp) {
112− eventAccepted = true;
113 volumeUpKeyPressed = false;
103 volumeUpKeyPressed = false;
114 aVolumeKeyWasReleased = true;
104 aVolumeKeyWasReleased = true;
115 }
105 }
116−
117− return eventAccepted;
118 }
106 }
119}
107}