enable teasing on the Phone even if we have a lockscreen
commitb25e0e9e944585899afcb115fdf371593f94a967
authorMichael Zanetti <michael.zanetti@canonical.com>
dateThu 5 Dec 2013, 15:10 (13 years ago)
parent0b5080e
Greeter/Greeter.qml+1−1
@@ -51,7 +51,7 @@ Showable {
5151 signal unlocked(int uid)
5252
5353 onRightTeaserPressedChanged: {
54− if (rightTeaserPressed && !locked && x == 0) {
54+ if (rightTeaserPressed && (!locked || narrowMode) && x == 0) {
5555 teasingTimer.start();
5656 }
5757 }
tests/qmltests/Greeter/tst_Phone.qml+1−1
@@ -103,7 +103,7 @@ Item {
103103 mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
104104 greeter.minX = 0; // This is needed because the transition actually makes x jump once before animating
105105
106− if (!data.locked && !data.moved) {
106+ if (!data.moved) {
107107 // Check if it has been moved over by 2 GUs. Give it a 2 pixel grace area
108108 // because animation duration and teaseTimer are the same duration and
109109 // might cause slight offsets