git.iko.soy/unity8
on xenial help sign in
remove the darkening layer for the launcher when it's opened by drag
8b885b1Michael Zanetti
qml/Launcher/Launcher.qml+2−10
compare with xenial
unifiedsplit
@@ -299,20 +299,12 @@ FocusScope {
299 enabled: root.state == "visible" && (!root.lockedVisible || panel.highlightIndex >= -1)
299 enabled: root.state == "visible" && (!root.lockedVisible || panel.highlightIndex >= -1)
300 visible: enabled
300 visible: enabled
301 onPressed: {
301 onPressed: {
302+ mouse.accepted = false;
302− panel.highlightIndex = -2
303+ panel.highlightIndex = -2;
303 root.hide();
304 root.hide();
304 }
305 }
305 }
306 }
306
307
307− Rectangle {
308− id: backgroundShade
309− anchors.fill: parent
310− color: "black"
311− opacity: root.state == "visible" && !root.lockedVisible ? 0.6 : 0
312−
313− Behavior on opacity { NumberAnimation { duration: UbuntuAnimation.BriskDuration } }
314− }
315−
316 EdgeBarrier {
308 EdgeBarrier {
317 id: edgeBarrier
309 id: edgeBarrier
318 edge: Qt.LeftEdge
310 edge: Qt.LeftEdge
tests/qmltests/Launcher/tst_Launcher.qml+14
@@ -34,6 +34,11 @@ Rectangle {
34
34
35 Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark"
35 Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark"
36
36
37+ MouseArea {
38+ id: clickThroughTester
39+ anchors.fill: parent
40+ }
41+
37 Loader {
42 Loader {
38 id: launcherLoader
43 id: launcherLoader
39 anchors.fill: parent
44 anchors.fill: parent
@@ -202,6 +207,12 @@ Rectangle {
202 target: LauncherModel
207 target: LauncherModel
203 }
208 }
204
209
210+ SignalSpy {
211+ id: clickThroughSpy
212+ target: clickThroughTester
213+ signalName: "clicked"
214+ }
215+
205 Item {
216 Item {
206 id: fakeDismissTimer
217 id: fakeDismissTimer
207 property bool running: false
218 property bool running: false
@@ -835,10 +846,12 @@ Rectangle {
835 function test_launcher_dismiss() {
846 function test_launcher_dismiss() {
836 dragLauncherIntoView();
847 dragLauncherIntoView();
837 verify(launcher.state == "visible");
848 verify(launcher.state == "visible");
849+ clickThroughSpy.clear();
838
850
839 mouseClick(root, root.width / 2, units.gu(1));
851 mouseClick(root, root.width / 2, units.gu(1));
840 waitUntilLauncherDisappears();
852 waitUntilLauncherDisappears();
841 verify(launcher.state == "");
853 verify(launcher.state == "");
854+ verify(clickThroughSpy.count, 1);
842
855
843 // and repeat, as a test for regression in lpbug#1531339
856 // and repeat, as a test for regression in lpbug#1531339
844 dragLauncherIntoView();
857 dragLauncherIntoView();
@@ -846,6 +859,7 @@ Rectangle {
846 mouseClick(root, root.width / 2, units.gu(1));
859 mouseClick(root, root.width / 2, units.gu(1));
847 waitUntilLauncherDisappears();
860 waitUntilLauncherDisappears();
848 verify(launcher.state == "");
861 verify(launcher.state == "");
862+ verify(clickThroughSpy.count, 2);
849 }
863 }
850
864
851 function test_quicklist_positioning_data() {
865 function test_quicklist_positioning_data() {