1
=== modified file 'Launcher/Launcher.qml'
2
--- Launcher/Launcher.qml	2013-09-12 19:08:06 +0000
3
+++ Launcher/Launcher.qml	2013-10-25 13:53:41 +0000
4
@@ -28,7 +28,7 @@
5
28
28
6
29
    property int panelWidth: units.gu(8)
29
    property int panelWidth: units.gu(8)
7
30
    property int dragAreaWidth: units.gu(1)
30
    property int dragAreaWidth: units.gu(1)
9
31
    property int minimizeDistance: panelWidth * 2.5
31
    property int minimizeDistance: units.gu(26)
10
32
    property real progress: dragArea.dragging  && dragArea.touchX > panelWidth ?
32
    property real progress: dragArea.dragging  && dragArea.touchX > panelWidth ?
11
33
                                (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
33
                                (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
12
34
34
13
35
35
14
=== modified file 'tests/qmltests/tst_Shell.qml'
15
--- tests/qmltests/tst_Shell.qml	2013-10-09 20:01:12 +0000
16
+++ tests/qmltests/tst_Shell.qml	2013-10-25 13:53:41 +0000
17
@@ -111,14 +111,14 @@
18
111
            waitUntilApplicationWindowIsFullyVisible();
111
            waitUntilApplicationWindowIsFullyVisible();
19
112
112
20
113
            // Minimize the application we just launched
113
            // Minimize the application we just launched
22
114
            swipeFromLeftEdge();
114
            swipeFromLeftEdge(units.gu(27));
23
115
115
24
116
            waitForUIToSettle();
116
            waitForUIToSettle();
25
117
117
26
118
            checkRightEdgeDragWithMinimizedApp();
118
            checkRightEdgeDragWithMinimizedApp();
27
119
119
28
120
            // Minimize that application once again
120
            // Minimize that application once again
30
121
            swipeFromLeftEdge();
121
            swipeFromLeftEdge(units.gu(27));
31
122
122
32
123
            // Right edge behavior should now be the same as before that app,
123
            // Right edge behavior should now be the same as before that app,
33
124
            // was launched.  Manually cleanup beforehand to get to initial
124
            // was launched.  Manually cleanup beforehand to get to initial
34
@@ -130,8 +130,10 @@
35
130
130
36
131
        function test_leftEdgeDrag_data() {
131
        function test_leftEdgeDrag_data() {
37
132
            return [
132
            return [
40
133
                {tag: "without launcher", revealLauncher: false},
133
                {tag: "without launcher", revealLauncher: false, swipeLength: units.gu(27), appHides: true},
41
134
                {tag: "with launcher", revealLauncher: true},
134
                {tag: "with launcher", revealLauncher: true, swipeLength: units.gu(27), appHides: true},
42
135
                {tag: "small swipe", revealLauncher: false, swipeLength: units.gu(25), appHides: false},
43
136
                {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true}
44
135
            ];
137
            ];
45
136
        }
138
        }
46
137
139
47
@@ -144,8 +146,11 @@
48
144
                dragLauncherIntoView();
146
                dragLauncherIntoView();
49
145
            }
147
            }
50
146
148
53
147
            swipeFromLeftEdge();
149
            swipeFromLeftEdge(data.swipeLength);
54
148
            waitUntilApplicationWindowIsFullyHidden();
150
            if (data.appHides)
55
151
                waitUntilApplicationWindowIsFullyHidden();
56
152
            else
57
153
                waitUntilApplicationWindowIsFullyVisible();
58
149
        }
154
        }
59
150
155
60
151
        function test_suspend() {
156
        function test_suspend() {
61
@@ -293,7 +298,7 @@
62
293
            waitUntilApplicationWindowIsFullyVisible();
298
            waitUntilApplicationWindowIsFullyVisible();
63
294
299
64
295
            // Minimize the application we just launched
300
            // Minimize the application we just launched
66
296
            swipeFromLeftEdge();
301
            swipeFromLeftEdge(units.gu(27));
67
297
302
68
298
            // Wait for the whole UI to settle down
303
            // Wait for the whole UI to settle down
69
299
            waitUntilApplicationWindowIsFullyHidden();
304
            waitUntilApplicationWindowIsFullyHidden();
70
@@ -376,10 +381,10 @@
71
376
            }
381
            }
72
377
        }
382
        }
73
378
383
75
379
        function swipeFromLeftEdge() {
384
        function swipeFromLeftEdge(swipeLength) {
76
380
            var touchStartX = 2;
385
            var touchStartX = 2;
77
381
            var touchStartY = shell.height / 2;
386
            var touchStartY = shell.height / 2;
79
382
            touchFlick(shell, touchStartX, touchStartY, shell.width * 0.75, touchStartY);
387
            touchFlick(shell, touchStartX, touchStartY, swipeLength, touchStartY);
80
383
        }
388
        }
81
384
389
82
385
        function swipeLeftFromCenter() {
390
        function swipeLeftFromCenter() {
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-05
Michael Zanetti (community)		2013-10-23	Approve on 2013-10-25
Review via email: mp+192399@code.launchpad.net