git.iko.soy/unity8
on xenial help sign in
enable teasing on the Phone even if we have a lockscreen
b25e0e9Michael Zanetti
Greeter/Greeter.qml+1−1
compare with xenial
unifiedsplit
@@ -51,7 +51,7 @@ Showable {
51 signal unlocked(int uid)
51 signal unlocked(int uid)
52
52
53 onRightTeaserPressedChanged: {
53 onRightTeaserPressedChanged: {
54− if (rightTeaserPressed && !locked && x == 0) {
54+ if (rightTeaserPressed && (!locked || narrowMode) && x == 0) {
55 teasingTimer.start();
55 teasingTimer.start();
56 }
56 }
57 }
57 }
tests/qmltests/Greeter/tst_Phone.qml+1−1
@@ -103,7 +103,7 @@ Item {
103 mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
103 mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
104 greeter.minX = 0; // This is needed because the transition actually makes x jump once before animating
104 greeter.minX = 0; // This is needed because the transition actually makes x jump once before animating
105
105
106− if (!data.locked && !data.moved) {
106+ if (!data.moved) {
107 // Check if it has been moved over by 2 GUs. Give it a 2 pixel grace area
107 // Check if it has been moved over by 2 GUs. Give it a 2 pixel grace area
108 // because animation duration and teaseTimer are the same duration and
108 // because animation duration and teaseTimer are the same duration and
109 // might cause slight offsets
109 // might cause slight offsets