git.iko.soy/unity8
on xenial help sign in
Fix merge
commit230c5f6d5eaf1ac9cb0ac73c66043846e3562894 authorAlbert Astals Cid <albert.astals@canonical.com> dateTue 2 Feb 2016, 10:22 (11 years ago) parent10aaf2f
2 files changed+2−2
compare with xenial
unifiedsplit
tests/qmltests/Launcher/tst_Launcher.qml+1−1 tests/qmltests/tst_Shell.qml+1−1
tests/qmltests/Launcher/tst_Launcher.qml+1−1
@@ -215,7 +215,7 @@ Item {
215215 // Now do check that snapping is in fact enabled
216216 compare(listView.snapMode, ListView.SnapToItem, "Snapping is not enabled");
217217
218− removeTimeConstraintsFromDirectionalDragAreas(root);
218+ removeTimeConstraintsFromSwipeAreas(root);
219219 }
220220
221221 function dragLauncherIntoView() {
tests/qmltests/tst_Shell.qml+1−1
@@ -660,7 +660,7 @@ Rectangle {
660660 function swipeAwayGreeter() {
661661 var greeter = findChild(shell, "greeter");
662662 tryCompare(greeter, "fullyShown", true);
663− removeTimeConstraintsFromDirectionalDragAreas(greeter);
663+ removeTimeConstraintsFromSwipeAreas(greeter);
664664
665665 var touchX = shell.width - (shell.edgeSize / 2);
666666 var touchY = shell.height / 2;