git.iko.soy/unity8
on xenial help sign in
Use volume instead of power key again
commit7accc0b187a5ad2cb3216d8ebb50865718a9bd9c authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 16 Feb 2015, 22:05 (12 years ago) parent5bb641c
2 files changed+7−11
compare with xenial
unifiedsplit
qml/Components/PhysicalKeysMapper.qml+3−7 tests/qmltests/Components/tst_PhysicalKeysMapper.qml+4−4
qml/Components/PhysicalKeysMapper.qml+3−7
@@ -37,16 +37,14 @@ Item {
3737
3838 signal powerKeyLongPress();
3939
40− property bool screenshotPressed: d.powerKeyPressed && d.volumeDownKeyPressed
41− property bool volumeDownPressed: d.volumeDownKeyPressed && !d.powerKeyPressed
42− property bool volumeUpPressed: d.volumeUpKeyPressed
40+ property bool screenshotPressed: d.volumeUpKeyPressed && d.volumeDownKeyPressed
41+ property bool volumeDownPressed: d.volumeDownKeyPressed && !d.volumeUpKeyPressed
42+ property bool volumeUpPressed: d.volumeUpKeyPressed && !d.volumeDownKeyPressed
4343 property int powerKeyLongPressTimeMs: 2000 // Is writable for testing purposes
4444
4545 QtObject {
4646 id: d
4747
48− property bool powerKeyPressed: false
49−
5048 property bool volumeDownKeyPressed: false
5149 property bool volumeUpKeyPressed: false
5250 }
@@ -82,7 +80,6 @@ Item {
8280 if (!powerKeyLongPressTimer.running) {
8381 powerKeyLongPressTimer.restart();
8482 }
85− d.powerKeyPressed = true;
8683 eventAccepted = true;
8784 }
8885 } else if (key == Qt.Key_MediaTogglePlayPause || key == Qt.Key_MediaPlay) {
@@ -101,7 +98,6 @@ Item {
10198
10299 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
103100 powerKeyLongPressTimer.stop();
104− d.powerKeyPressed = false;
105101 eventAccepted = true;
106102 } else if (key == Qt.Key_VolumeDown) {
107103 d.volumeDownKeyPressed = false;
tests/qmltests/Components/tst_PhysicalKeysMapper.qml+4−4
@@ -55,19 +55,19 @@ TestCase {
5555 }
5656
5757 function test_ScreenshotButtons() {
58− /* Behavior when Power is pressed 1st */
59− physicalKeysMapper.onKeyPressed(Qt.Key_PowerDown);
58+ /* Behavior when VolumeUp is pressed 1st */
59+ physicalKeysMapper.onKeyPressed(Qt.Key_VolumeUp);
6060 physicalKeysMapper.onKeyPressed(Qt.Key_VolumeDown);
6161 compare(physicalKeysMapper.screenshotPressed, true);
6262 compare(physicalKeysMapper.volumeDownPressed, false);
6363
64− physicalKeysMapper.onKeyReleased(Qt.Key_PowerDown);
64+ physicalKeysMapper.onKeyReleased(Qt.Key_VolumeUp);
6565 physicalKeysMapper.onKeyReleased(Qt.Key_VolumeDown);
6666
6767 /* Behavior when VolumeDown is pressed 1st */
6868 physicalKeysMapper.onKeyPressed(Qt.Key_VolumeDown);
6969 compare(physicalKeysMapper.volumeDownPressed, true);
70− physicalKeysMapper.onKeyPressed(Qt.Key_PowerDown);
70+ physicalKeysMapper.onKeyPressed(Qt.Key_VolumeUp);
7171 compare(physicalKeysMapper.screenshotPressed, true);
7272 }
7373