1
=== modified file 'qml/Components/EdgeBarrier.qml'
2
--- qml/Components/EdgeBarrier.qml	2016-09-07 12:41:18 +0000
3
+++ qml/Components/EdgeBarrier.qml	2017-01-26 09:09:40 +0000
4
@@ -30,6 +30,7 @@
5
30
    property int edge: Qt.LeftEdge
30
    property int edge: Qt.LeftEdge
6
31
31
7
32
    readonly property alias progress: controller.progress
32
    readonly property alias progress: controller.progress
8
33
    readonly property alias containsMouse: controller.containsMouse
9
33
34
10
34
    property Item target: parent
35
    property Item target: parent
11
35
    function push(amount) { controller.push(amount); }
36
    function push(amount) { controller.push(amount); }
12
36
37
13
=== modified file 'qml/Launcher/Launcher.qml'
14
--- qml/Launcher/Launcher.qml	2017-01-24 07:42:24 +0000
15
+++ qml/Launcher/Launcher.qml	2017-01-26 09:09:40 +0000
16
@@ -414,7 +414,7 @@
17
414
            target: panel.dismissTimer
414
            target: panel.dismissTimer
18
415
            onTriggered: {
415
            onTriggered: {
19
416
                if (root.autohideEnabled && !root.lockedVisible) {
416
                if (root.autohideEnabled && !root.lockedVisible) {
21
417
                    if (!panel.preventHiding) {
417
                    if (!edgeBarrier.containsMouse && !panel.preventHiding) {
22
418
                        root.state = ""
418
                        root.state = ""
23
419
                    } else {
419
                    } else {
24
420
                        panel.dismissTimer.restart()
420
                        panel.dismissTimer.restart()
25
421
421
26
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
27
--- tests/qmltests/Launcher/tst_Launcher.qml	2017-01-24 07:42:24 +0000
28
+++ tests/qmltests/Launcher/tst_Launcher.qml	2017-01-26 09:09:40 +0000
29
@@ -1480,6 +1480,19 @@
30
1480
            launcher.available = true;
1480
            launcher.available = true;
31
1481
        }
1481
        }
32
1482
1482
33
1483
        function test_hoverOnEdgeBarrerPreventsHiding() {
34
1484
            revealByEdgePush();
35
1485
36
1486
            // Make sure the mouse is on the very left edge (on top of the barrier)
37
1487
            mouseMove(root, 1, root.height / 2);
38
1488
39
1489
            // trigger the hide timer
40
1490
            compare(fakeDismissTimer.running, true);
41
1491
            fakeDismissTimer.triggered();
42
1492
43
1493
            compare(launcher.state, "visibleTemporary");
44
1494
        }
45
1495
46
1483
        function test_hintOnSizeChange() {
1496
        function test_hintOnSizeChange() {
47
1484
            var oldSize = launcher.panelWidth;
1497
            var oldSize = launcher.panelWidth;
48
1485
            launcher.maxPanelX = -launcher.panelWidth;
1498
            launcher.maxPanelX = -launcher.panelWidth;
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2017-01-26
Albert Astals Cid (community)		2017-01-18	Approve on 2017-01-26
Review via email: mp+315033@code.launchpad.net