git.iko.soy/unity8
on xenial help sign in
Use volume instead of power key again
7accc0bMichał Sawicz
qml/Components/PhysicalKeysMapper.qml+3−7
compare with xenial
unifiedsplit
@@ -37,16 +37,14 @@ Item {
37
37
38 signal powerKeyLongPress();
38 signal powerKeyLongPress();
39
39
40− property bool screenshotPressed: d.powerKeyPressed && d.volumeDownKeyPressed
40+ property bool screenshotPressed: d.volumeUpKeyPressed && d.volumeDownKeyPressed
41− property bool volumeDownPressed: d.volumeDownKeyPressed && !d.powerKeyPressed
41+ property bool volumeDownPressed: d.volumeDownKeyPressed && !d.volumeUpKeyPressed
42− property bool volumeUpPressed: d.volumeUpKeyPressed
42+ property bool volumeUpPressed: d.volumeUpKeyPressed && !d.volumeDownKeyPressed
43 property int powerKeyLongPressTimeMs: 2000 // Is writable for testing purposes
43 property int powerKeyLongPressTimeMs: 2000 // Is writable for testing purposes
44
44
45 QtObject {
45 QtObject {
46 id: d
46 id: d
47
47
48− property bool powerKeyPressed: false
49−
50 property bool volumeDownKeyPressed: false
48 property bool volumeDownKeyPressed: false
51 property bool volumeUpKeyPressed: false
49 property bool volumeUpKeyPressed: false
52 }
50 }
@@ -82,7 +80,6 @@ Item {
82 if (!powerKeyLongPressTimer.running) {
80 if (!powerKeyLongPressTimer.running) {
83 powerKeyLongPressTimer.restart();
81 powerKeyLongPressTimer.restart();
84 }
82 }
85− d.powerKeyPressed = true;
86 eventAccepted = true;
83 eventAccepted = true;
87 }
84 }
88 } else if (key == Qt.Key_MediaTogglePlayPause || key == Qt.Key_MediaPlay) {
85 } else if (key == Qt.Key_MediaTogglePlayPause || key == Qt.Key_MediaPlay) {
@@ -101,7 +98,6 @@ Item {
101
98
102 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
99 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
103 powerKeyLongPressTimer.stop();
100 powerKeyLongPressTimer.stop();
104− d.powerKeyPressed = false;
105 eventAccepted = true;
101 eventAccepted = true;
106 } else if (key == Qt.Key_VolumeDown) {
102 } else if (key == Qt.Key_VolumeDown) {
107 d.volumeDownKeyPressed = false;
103 d.volumeDownKeyPressed = false;
tests/qmltests/Components/tst_PhysicalKeysMapper.qml+4−4
@@ -55,19 +55,19 @@ TestCase {
55 }
55 }
56
56
57 function test_ScreenshotButtons() {
57 function test_ScreenshotButtons() {
58− /* Behavior when Power is pressed 1st */
58+ /* Behavior when VolumeUp is pressed 1st */
59− physicalKeysMapper.onKeyPressed(Qt.Key_PowerDown);
59+ physicalKeysMapper.onKeyPressed(Qt.Key_VolumeUp);
60 physicalKeysMapper.onKeyPressed(Qt.Key_VolumeDown);
60 physicalKeysMapper.onKeyPressed(Qt.Key_VolumeDown);
61 compare(physicalKeysMapper.screenshotPressed, true);
61 compare(physicalKeysMapper.screenshotPressed, true);
62 compare(physicalKeysMapper.volumeDownPressed, false);
62 compare(physicalKeysMapper.volumeDownPressed, false);
63
63
64− physicalKeysMapper.onKeyReleased(Qt.Key_PowerDown);
64+ physicalKeysMapper.onKeyReleased(Qt.Key_VolumeUp);
65 physicalKeysMapper.onKeyReleased(Qt.Key_VolumeDown);
65 physicalKeysMapper.onKeyReleased(Qt.Key_VolumeDown);
66
66
67 /* Behavior when VolumeDown is pressed 1st */
67 /* Behavior when VolumeDown is pressed 1st */
68 physicalKeysMapper.onKeyPressed(Qt.Key_VolumeDown);
68 physicalKeysMapper.onKeyPressed(Qt.Key_VolumeDown);
69 compare(physicalKeysMapper.volumeDownPressed, true);
69 compare(physicalKeysMapper.volumeDownPressed, true);
70− physicalKeysMapper.onKeyPressed(Qt.Key_PowerDown);
70+ physicalKeysMapper.onKeyPressed(Qt.Key_VolumeUp);
71 compare(physicalKeysMapper.screenshotPressed, true);
71 compare(physicalKeysMapper.screenshotPressed, true);
72 }
72 }
73
73