git.iko.soy/unity8
on xenial help sign in
Ignore multiple key presses, only take one screenshot if keys are held.
7476974Alberto Aguirre
qml/Components/ScreenGrabber.qml+17−10
compare with xenial
unifiedsplit
@@ -27,9 +27,10 @@ Rectangle {
27
27
28 QtObject {
28 QtObject {
29 id: keyState
29 id: keyState
30− property bool volumeUp: false
30+ property bool volumeUpPressed: false
31− property bool volumeDown: false
31+ property bool volumeDownPressed: false
32 property bool ignoreKeyPresses: false
32 property bool ignoreKeyPresses: false
33+ property bool ignoreKeyRepeats: false
33 }
34 }
34
35
35 ScreenGrabber {
36 ScreenGrabber {
@@ -43,15 +44,17 @@ Rectangle {
43 }
44 }
44
45
45 function onKeyPressed(key) {
46 function onKeyPressed(key) {
46− if (keyState.ignoreKeyPresses)
47+ if (keyState.ignoreKeyPresses || keyState.ignoreKeyRepeats)
47 return;
48 return;
48
49
49 if (key == Qt.Key_VolumeUp)
50 if (key == Qt.Key_VolumeUp)
50− keyState.volumeUp = true;
51+ keyState.volumeUpPressed = true;
51 else if (key == Qt.Key_VolumeDown)
52 else if (key == Qt.Key_VolumeDown)
52− keyState.volumeDown = true;
53+ keyState.volumeDownPressed = true;
53
54
54− if (keyState.volumeDown && keyState.volumeUp) {
55+ if (keyState.volumeDownPressed && keyState.volumeUpPressed) {
56+ // Only take one screenshot if both keys are held
57+ keyState.ignoreKeyRepeats = true;
55 enabled = true;
58 enabled = true;
56 visible = true;
59 visible = true;
57 fadeIn.start();
60 fadeIn.start();
@@ -59,10 +62,14 @@ Rectangle {
59 }
62 }
60
63
61 function onKeyReleased(key) {
64 function onKeyReleased(key) {
62− if (key == Qt.Key_VolumeUp)
65+ if (key == Qt.Key_VolumeUp) {
63− keyState.volumeUp = false;
66+ keyState.volumeUpPressed = false;
67+ keyState.ignoreKeyRepeats = false;
68+ }
64− else if (key == Qt.Key_VolumeDown)
69+ else if (key == Qt.Key_VolumeDown) {
65− keyState.volumeDown = false;
70+ keyState.volumeDownPressed = false;
71+ keyState.ignoreKeyRepeats = false;
72+ }
66 }
73 }
67
74
68 NumberAnimation on opacity {
75 NumberAnimation on opacity {