on xenial help sign in
Do not accept volume events.
d95d19fJosh Arenson
qml/Components/PhysicalKeysMapper.qml+5−6
@@ -64,7 +64,7 @@ Item {
64
64
65
65
66 function onKeyPressed(key) {
66 function onKeyPressed(key) {
67− var eventAccepted = true;
67+ var eventAccepted = false;
68
68
69 /* Determine what key was pressed */
69 /* Determine what key was pressed */
70 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
70 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
@@ -82,6 +82,7 @@ Item {
82 powerKeyLongPressTimer.restart();
82 powerKeyLongPressTimer.restart();
83 }
83 }
84 d.powerKeyPressed = true;
84 d.powerKeyPressed = true;
85+ eventAccepted = true;
85 }
86 }
86 } else if (key == Qt.Key_MediaTogglePlayPause || key == Qt.Key_MediaPlay) {
87 } else if (key == Qt.Key_MediaTogglePlayPause || key == Qt.Key_MediaPlay) {
87 eventAccepted = callManager.handleMediaKey(false);
88 eventAccepted = callManager.handleMediaKey(false);
@@ -89,8 +90,6 @@ Item {
89 d.volumeDownKeyPressed = true;
90 d.volumeDownKeyPressed = true;
90 } else if (key == Qt.Key_VolumeUp) {
91 } else if (key == Qt.Key_VolumeUp) {
91 d.volumeUpKeyPressed = true;
92 d.volumeUpKeyPressed = true;
92− } else {
93− eventAccepted = false;
94 }
93 }
95
94
96 /* Determine how to handle it */
95 /* Determine how to handle it */
@@ -109,19 +108,19 @@ Item {
109 }
108 }
110
109
111 function onKeyReleased(key) {
110 function onKeyReleased(key) {
112− var eventAccepted = true;
111+ var eventAccepted = false;
113
112
114 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
113 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
115 powerKeyLongPressTimer.stop();
114 powerKeyLongPressTimer.stop();
116 d.powerKeyPressed = false;
115 d.powerKeyPressed = false;
117 d.aPowerKeyWasReleased = true;
116 d.aPowerKeyWasReleased = true;
117+ eventAccepted = true;
118 } else if (key == Qt.Key_VolumeDown) {
118 } else if (key == Qt.Key_VolumeDown) {
119 d.volumeDownKeyPressed = false;
119 d.volumeDownKeyPressed = false;
120 } else if (key == Qt.Key_VolumeUp) {
120 } else if (key == Qt.Key_VolumeUp) {
121 d.volumeUpKeyPressed = false;
121 d.volumeUpKeyPressed = false;
122− } else {
123− eventAccepted = false;
124 }
122 }
123+
125 return eventAccepted;
124 return eventAccepted;
126 }
125 }
127}
126}