on xenial help sign in
Don't take screenshots while screen is off.
commitd143f1f21b5f792f7d34d31196b9ab523f143bc4 authorAlberto Aguirre <alberto.aguirre@canonical.com> dateSat 27 Sep 2014, 16:25 (12 years ago) parentfdbf6e6
2 files changed+13−2
qml/Components/ScreenGrabber.qml+11−1 qml/Shell.qml+2−1
qml/Components/ScreenGrabber.qml+11−1
@@ -29,6 +29,7 @@ Rectangle {
2929 id: keyState
3030 property bool volumeUp: false
3131 property bool volumeDown: false
32+ property bool ignoreKeyPresses: false
3233 }
3334
3435 ScreenGrabber {
@@ -36,11 +37,20 @@ Rectangle {
3637 objectName: "screenGrabber"
3738 }
3839
40+ function enable(flag)
41+ {
42+ keyState.ignoreKeyPresses = !flag;
43+ }
44+
3945 function onKeyPressed(key) {
46+ if (keyState.ignoreKeyPresses)
47+ return;
48+
4049 if (key == Qt.Key_VolumeUp)
4150 keyState.volumeUp = true;
4251 else if (key == Qt.Key_VolumeDown)
4352 keyState.volumeDown = true;
53+
4454 if (keyState.volumeDown && keyState.volumeUp) {
4555 enabled = true;
4656 visible = true;
@@ -49,7 +59,7 @@ Rectangle {
4959 }
5060
5161 function onKeyReleased(key) {
52− if (key == Qt.Key_VolumeUp)
62+ if (key == Qt.Key_VolumeUp)
5363 keyState.volumeUp = false;
5464 else if (key == Qt.Key_VolumeDown)
5565 keyState.volumeDown = false;
qml/Shell.qml+2−1
@@ -127,7 +127,7 @@ Item {
127127 id: dash
128128 objectName: "dashCommunicator"
129129 }
130−
130+
131131 ScreenGrabber {
132132 id: screenGrabber
133133 z: edgeDemo.z + 10
@@ -496,6 +496,7 @@ Item {
496496 target: Powerd
497497
498498 onStatusChanged: {
499+ screenGrabber.enable(Powerd.status === Powerd.On)
499500 if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
500501 greeter.showNow()
501502 }