git.iko.soy/unity8
on xenial help sign in
Do not emit volumeDown when taking a screenshot
363bfefJosh Arenson
qml/Components/PhysicalKeysFilter.qml+3−4
compare with xenial
unifiedsplit
@@ -48,7 +48,6 @@ QtObject {
48
48
49 function onKeyPressed(key) {
49 function onKeyPressed(key) {
50 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
50 if (key == Qt.Key_PowerDown || key == Qt.Key_PowerOff) {
51− console.log("JOSH: Pressed power key");
52 powerKeyPressed = true;
51 powerKeyPressed = true;
53 }
52 }
54 else if (key == Qt.Key_VolumeDown) {
53 else if (key == Qt.Key_VolumeDown) {
@@ -65,11 +64,11 @@ QtObject {
65 aVolumeKeyWasReleased = false;
64 aVolumeKeyWasReleased = false;
66 }
65 }
67 else if (volumeDownKeyPressed) {
66 else if (volumeDownKeyPressed) {
68− console.log("JOSH: VolumeDown!");
69 if (powerKeyPressed) {
67 if (powerKeyPressed) {
70− console.log("JOSH: TAKE A SCREENSHOT");
68+ screenshotPressed();
69+ } else {
70+ volumeDownPressed();
71 }
71 }
72− volumeDownPressed();
73 }
72 }
74 else if (volumeUpKeyPressed) {
73 else if (volumeUpKeyPressed) {
75 volumeUpPressed();
74 volumeUpPressed();
qml/Shell.qml+1−1
@@ -159,7 +159,7 @@ Item {
159
159
160 onVolumeDownPressed: volumeControl.volumeDown()
160 onVolumeDownPressed: volumeControl.volumeDown()
161 onVolumeUpPressed: volumeControl.volumeUp()
161 onVolumeUpPressed: volumeControl.volumeUp()
162− //onBothVolumeKeysPressed: screenGrabber.capture()
162+ onScreenshotPressed: screenGrabber.capture()
163 }
163 }
164
164
165 ScreenGrabber {
165 ScreenGrabber {