git.iko.soy/unity8
on xenial help sign in
Address review feedback
32490b6Alberto Aguirre
plugins/ScreenGrabber/screengrabber.cpp+1−1
compare with xenial
unifiedsplit
@@ -60,7 +60,7 @@ void ScreenGrabber::captureAndSave()
60 return;
60 return;
61 }
61 }
62
62
63− QWindowList windows = QGuiApplication::topLevelWindows();
63+ const QWindowList windows = QGuiApplication::topLevelWindows();
64 if (windows.empty())
64 if (windows.empty())
65 {
65 {
66 qWarning() << "ScreenShotter: no top level windows found!";
66 qWarning() << "ScreenShotter: no top level windows found!";
qml/Components/ScreenGrabber.qml+4−10
@@ -45,11 +45,6 @@ Rectangle {
45 source: "/system/media/audio/ui/camera_click.ogg"
45 source: "/system/media/audio/ui/camera_click.ogg"
46 }
46 }
47
47
48− function enable(flag)
49− {
50− keyState.ignoreKeyPresses = !flag;
51− }
52−
53 function onKeyPressed(key) {
48 function onKeyPressed(key) {
54 if (keyState.ignoreKeyPresses || keyState.ignoreKeyRepeats)
49 if (keyState.ignoreKeyPresses || keyState.ignoreKeyRepeats)
55 return;
50 return;
@@ -74,8 +69,7 @@ Rectangle {
74 if (key == Qt.Key_VolumeUp) {
69 if (key == Qt.Key_VolumeUp) {
75 keyState.volumeUpPressed = false;
70 keyState.volumeUpPressed = false;
76 keyState.ignoreKeyRepeats = false;
71 keyState.ignoreKeyRepeats = false;
77− }
78− else if (key == Qt.Key_VolumeDown) {
72+ } else if (key == Qt.Key_VolumeDown) {
79 keyState.volumeDownPressed = false;
73 keyState.volumeDownPressed = false;
80 keyState.ignoreKeyRepeats = false;
74 keyState.ignoreKeyRepeats = false;
81 }
75 }
@@ -87,7 +81,7 @@ Rectangle {
87 to: 1.0
81 to: 1.0
88 onStopped: {
82 onStopped: {
89 if (enabled && visible) {
83 if (enabled && visible) {
90− fadeOut.start()
84+ fadeOut.start();
91 }
85 }
92 }
86 }
93 }
87 }
@@ -99,8 +93,8 @@ Rectangle {
99 onStopped: {
93 onStopped: {
100 if (enabled && visible) {
94 if (enabled && visible) {
101 screenGrabber.captureAndSave();
95 screenGrabber.captureAndSave();
102− enabled = false
96+ enabled = false;
103− visible = false
97+ visible = false;
104 }
98 }
105 }
99 }
106 }
100 }
qml/Shell.qml+6−1
@@ -133,6 +133,12 @@ Item {
133 z: edgeDemo.z + 10
133 z: edgeDemo.z + 10
134 }
134 }
135
135
136+ Binding {
137+ target: screenGrabber
138+ property: keyState.ignoreKeyPresses
139+ value: Powerd.status === Powerd.Off
140+ }
141+
136 Binding {
142 Binding {
137 target: ApplicationManager
143 target: ApplicationManager
138 property: "forceDashActive"
144 property: "forceDashActive"
@@ -568,7 +574,6 @@ Item {
568 target: Powerd
574 target: Powerd
569
575
570 onStatusChanged: {
576 onStatusChanged: {
571− screenGrabber.enable(Powerd.status === Powerd.On)
572 if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
577 if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
573 greeter.showNow()
578 greeter.showNow()
574 }
579 }