f13c124 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

fix swiping away the launcher from the left edge

f13c124Michael Zanetti12 years ago

qml/Shell.qml+4

compare with xenial

unifiedsplit

@@ -568,6 +568,10 @@ Item {

568 if (ApplicationManager.focusedApplicationId != "unity8-dash") {

569 showDash()

570 }

571+ if (greeter.shown) {

572+ launcher.fadeOut()

573+ greeter.hideRight()

574+ }

571 }

575 }

572 onDashSwipeChanged: {

576 onDashSwipeChanged: {

573 if (dashSwipe) {

577 if (dashSwipe) {

tests/qmltests/tst_Shell.qml+19

@@ -548,5 +548,24 @@ Row {

548 expectFail("", "Unlock on boot temporarily disabled");

549 tryCompare(unlockAllModemsSpy, "count", 1)

550 }

551+

552+ function test_leftEdgeDragOnGreeter_data() {

553+ return [

554+ {tag: "short swipe", targetX: shell.width / 3, unlocked: false},

555+ {tag: "long swipe", targetX: shell.width / 3 * 2, unlocked: true}

556+ ]

557+ }

558+

559+ function test_leftEdgeDragOnGreeter(data) {

560+ var greeter = findChild(shell, "greeter");

561+ greeter.show();

562+ tryCompare(greeter, "showProgress", 1);

563+

564+ var touchStartX = 2;

565+ var touchStartY = shell.height / 2;

566+ touchFlick(shell, touchStartX, touchStartY, data.targetX, touchStartY);

567+

568+ tryCompare(greeter, "showProgress", data.unlocked ? 0 : 1);

569+ }

551 }

570 }

552}

571}