1
=== modified file 'Greeter/Greeter.qml'
2
--- Greeter/Greeter.qml	2013-09-13 15:17:02 +0000
3
+++ Greeter/Greeter.qml	2013-10-29 14:20:30 +0000
4
@@ -52,7 +52,7 @@
5
52
    signal unlocked(int uid)
52
    signal unlocked(int uid)
6
53
53
7
54
    onRightTeaserPressedChanged: {
54
    onRightTeaserPressedChanged: {
9
55
        if (rightTeaserPressed && !locked) {
55
        if (rightTeaserPressed && !locked && x == 0) {
10
56
            teasingTimer.start();
56
            teasingTimer.start();
11
57
        }
57
        }
12
58
    }
58
    }
13
59
59
14
=== modified file 'tests/qmltests/Greeter/tst_Phone.qml'
15
--- tests/qmltests/Greeter/tst_Phone.qml	2013-09-30 16:03:59 +0000
16
+++ tests/qmltests/Greeter/tst_Phone.qml	2013-10-29 14:20:30 +0000
17
@@ -83,8 +83,9 @@
18
83
83
19
84
        function test_teaseLockedUnlocked_data() {
84
        function test_teaseLockedUnlocked_data() {
20
85
            return [
85
            return [
23
86
                {tag: "unlocked", locked: false},
86
                {tag: "unlocked", locked: false, moved: false},
24
87
                {tag: "locked", locked: true}
87
                {tag: "locked", locked: true, moved: false},
25
88
                {tag: "moved", locked: false, moved: true}
26
88
            ];
89
            ];
27
89
        }
90
        }
28
90
91
29
@@ -93,10 +94,16 @@
30
93
            tryCompare(greeter, "x", 0);
94
            tryCompare(greeter, "x", 0);
31
94
            greeter.locked = data.locked;
95
            greeter.locked = data.locked;
32
95
96
33
97
            // simulate greeter being in the middle of a swipe
34
98
            if (data.moved) {
35
99
                greeter.x = -units.gu(4);
36
100
                tryCompare(greeter, "x", -units.gu(4));
37
101
            }
38
102
39
96
            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));
40
97
            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
41
98
105
43
99
            if (!data.locked) {
106
            if (!data.locked && !data.moved) {
44
100
                // 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
45
101
                // because animation duration and teaseTimer are the same duration and
108
                // because animation duration and teaseTimer are the same duration and
46
102
                // might cause slight offsets
109
                // might cause slight offsets
47
@@ -104,10 +111,16 @@
48
104
            } else {
111
            } else {
49
105
                // waiting 100ms to make sure nothing moves
112
                // waiting 100ms to make sure nothing moves
50
106
                wait(100);
113
                wait(100);
53
107
                compare(greeter.minX, 0, "Greeter moved even tho its locked");
114
                compare(greeter.minX, 0, "Greeter teasing not disabled even though it's locked or moving.");
54
108
            }
115
            }
55
116
56
117
            // Restore position in case we moved it for the test
57
118
            if (data.moved) {
58
119
                greeter.x = 0;
59
120
            }
60
121
61
109
            // Wait until we're back to 0
122
            // Wait until we're back to 0
63
110
            tryCompareFunction(function() { return greeter.x;},  0);
123
            tryCompareFunction(function() { return greeter.x;}, 0);
64
111
        }
124
        }
65
112
125
66
113
        function test_statsWelcomeScreen() {
126
        function test_statsWelcomeScreen() {
Status:	Merged
Approved by:	Andrea Cimitan on 2013-10-29
Approved revision:	480
Merged at revision:	494
Proposed branch:	lp:~mzanetti/unity8/dont-tease-while-moving
Merge into:	lp:unity8
Diff against target:	66 lines (+20/-7) 2 files modified Greeter/Greeter.qml (+1/-1) tests/qmltests/Greeter/tst_Phone.qml (+19/-6)
To merge this branch:	bzr merge lp:~mzanetti/unity8/dont-tease-while-moving
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-11-04
Andrea Cimitan (community)		2013-10-23	Approve on 2013-10-29
Review via email: mp+192366@code.launchpad.net