git.iko.soy/unity8
on xenial help sign in
Address review feedback
commit32490b602ff957824542ea5ebb562a40242fa0f6 authorAlberto Aguirre <alberto.aguirre@canonical.com> dateTue 14 Oct 2014, 12:16 (12 years ago) parentef38c29
3 files changed+11−12
compare with xenial
unifiedsplit
plugins/ScreenGrabber/screengrabber.cpp+1−1 qml/Components/ScreenGrabber.qml+4−10 qml/Shell.qml+6−1
plugins/ScreenGrabber/screengrabber.cpp+1−1
@@ -60,7 +60,7 @@ void ScreenGrabber::captureAndSave()
6060 return;
6161 }
6262
63− QWindowList windows = QGuiApplication::topLevelWindows();
63+ const QWindowList windows = QGuiApplication::topLevelWindows();
6464 if (windows.empty())
6565 {
6666 qWarning() << "ScreenShotter: no top level windows found!";
qml/Components/ScreenGrabber.qml+4−10
@@ -45,11 +45,6 @@ Rectangle {
4545 source: "/system/media/audio/ui/camera_click.ogg"
4646 }
4747
48− function enable(flag)
49− {
50− keyState.ignoreKeyPresses = !flag;
51− }
52−
5348 function onKeyPressed(key) {
5449 if (keyState.ignoreKeyPresses || keyState.ignoreKeyRepeats)
5550 return;
@@ -74,8 +69,7 @@ Rectangle {
7469 if (key == Qt.Key_VolumeUp) {
7570 keyState.volumeUpPressed = false;
7671 keyState.ignoreKeyRepeats = false;
77− }
78− else if (key == Qt.Key_VolumeDown) {
72+ } else if (key == Qt.Key_VolumeDown) {
7973 keyState.volumeDownPressed = false;
8074 keyState.ignoreKeyRepeats = false;
8175 }
@@ -87,7 +81,7 @@ Rectangle {
8781 to: 1.0
8882 onStopped: {
8983 if (enabled && visible) {
90− fadeOut.start()
84+ fadeOut.start();
9185 }
9286 }
9387 }
@@ -99,8 +93,8 @@ Rectangle {
9993 onStopped: {
10094 if (enabled && visible) {
10195 screenGrabber.captureAndSave();
102− enabled = false
103− visible = false
96+ enabled = false;
97+ visible = false;
10498 }
10599 }
106100 }
qml/Shell.qml+6−1
@@ -133,6 +133,12 @@ Item {
133133 z: edgeDemo.z + 10
134134 }
135135
136+ Binding {
137+ target: screenGrabber
138+ property: keyState.ignoreKeyPresses
139+ value: Powerd.status === Powerd.Off
140+ }
141+
136142 Binding {
137143 target: ApplicationManager
138144 property: "forceDashActive"
@@ -568,7 +574,6 @@ Item {
568574 target: Powerd
569575
570576 onStatusChanged: {
571− screenGrabber.enable(Powerd.status === Powerd.On)
572577 if (Powerd.status === Powerd.Off && !callManager.hasCalls && !edgeDemo.running) {
573578 greeter.showNow()
574579 }