git.iko.soy/unity8
on xenial help sign in
Threshold to activate the left edge swipe to reveal dash is now 26 GU. Fixes: https://bugs.launchpad.net/bugs/1236286.
78a10e3Andrea Cimitan
Launcher/Launcher.qml+1−1
compare with xenial
unifiedsplit
@@ -28,7 +28,7 @@ Item {
28
28
29 property int panelWidth: units.gu(8)
29 property int panelWidth: units.gu(8)
30 property int dragAreaWidth: units.gu(1)
30 property int dragAreaWidth: units.gu(1)
31− property int minimizeDistance: panelWidth * 2.5
31+ property int minimizeDistance: units.gu(26)
32 property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
32 property real progress: dragArea.dragging && dragArea.touchX > panelWidth ?
33 (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
33 (width * (dragArea.touchX-panelWidth) / (width - panelWidth)) : 0
34
34
tests/qmltests/tst_Shell.qml+14−9
@@ -111,14 +111,14 @@ Item {
111 waitUntilApplicationWindowIsFullyVisible();
111 waitUntilApplicationWindowIsFullyVisible();
112
112
113 // Minimize the application we just launched
113 // Minimize the application we just launched
114− swipeFromLeftEdge();
114+ swipeFromLeftEdge(units.gu(27));
115
115
116 waitForUIToSettle();
116 waitForUIToSettle();
117
117
118 checkRightEdgeDragWithMinimizedApp();
118 checkRightEdgeDragWithMinimizedApp();
119
119
120 // Minimize that application once again
120 // Minimize that application once again
121− swipeFromLeftEdge();
121+ swipeFromLeftEdge(units.gu(27));
122
122
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,
124 // was launched. Manually cleanup beforehand to get to initial
124 // was launched. Manually cleanup beforehand to get to initial
@@ -130,8 +130,10 @@ Item {
130
130
131 function test_leftEdgeDrag_data() {
131 function test_leftEdgeDrag_data() {
132 return [
132 return [
133− {tag: "without launcher", revealLauncher: false},
133+ {tag: "without launcher", revealLauncher: false, swipeLength: units.gu(27), appHides: true},
134− {tag: "with launcher", revealLauncher: true},
134+ {tag: "with launcher", revealLauncher: true, swipeLength: units.gu(27), appHides: true},
135+ {tag: "small swipe", revealLauncher: false, swipeLength: units.gu(25), appHides: false},
136+ {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true}
135 ];
137 ];
136 }
138 }
137
139
@@ -144,8 +146,11 @@ Item {
144 dragLauncherIntoView();
146 dragLauncherIntoView();
145 }
147 }
146
148
147− swipeFromLeftEdge();
149+ swipeFromLeftEdge(data.swipeLength);
150+ if (data.appHides)
148− waitUntilApplicationWindowIsFullyHidden();
151+ waitUntilApplicationWindowIsFullyHidden();
152+ else
153+ waitUntilApplicationWindowIsFullyVisible();
149 }
154 }
150
155
151 function test_suspend() {
156 function test_suspend() {
@@ -293,7 +298,7 @@ Item {
293 waitUntilApplicationWindowIsFullyVisible();
298 waitUntilApplicationWindowIsFullyVisible();
294
299
295 // Minimize the application we just launched
300 // Minimize the application we just launched
296− swipeFromLeftEdge();
301+ swipeFromLeftEdge(units.gu(27));
297
302
298 // Wait for the whole UI to settle down
303 // Wait for the whole UI to settle down
299 waitUntilApplicationWindowIsFullyHidden();
304 waitUntilApplicationWindowIsFullyHidden();
@@ -376,10 +381,10 @@ Item {
376 }
381 }
377 }
382 }
378
383
379− function swipeFromLeftEdge() {
384+ function swipeFromLeftEdge(swipeLength) {
380 var touchStartX = 2;
385 var touchStartX = 2;
381 var touchStartY = shell.height / 2;
386 var touchStartY = shell.height / 2;
382− touchFlick(shell, touchStartX, touchStartY, shell.width * 0.75, touchStartY);
387+ touchFlick(shell, touchStartX, touchStartY, swipeLength, touchStartY);
383 }
388 }
384
389
385 function swipeLeftFromCenter() {
390 function swipeLeftFromCenter() {