1
=== modified file 'Greeter/Greeter.qml'
2
--- Greeter/Greeter.qml	2013-06-19 08:29:34 +0000
3
+++ Greeter/Greeter.qml	2013-06-28 16:41:39 +0000
4
@@ -48,7 +48,7 @@
5
48
    signal unlocked(int uid)
48
    signal unlocked(int uid)
6
49
49
7
50
    onRightTeaserPressedChanged: {
50
    onRightTeaserPressedChanged: {
9
51
        if (rightTeaserPressed) {
51
        if (rightTeaserPressed && !locked) {
10
52
            teasingTimer.start();
52
            teasingTimer.start();
11
53
        }
53
        }
12
54
    }
54
    }
13
@@ -81,7 +81,7 @@
14
81
    states: [
81
    states: [
15
82
        State {
82
        State {
16
83
            name: "teasing"
83
            name: "teasing"
18
84
            when: greeter.rightTeaserPressed || teasingTimer.running
84
            when: teasingTimer.running
19
85
            PropertyChanges {
85
            PropertyChanges {
20
86
                target: greeter
86
                target: greeter
21
87
                x: -units.gu(2)
87
                x: -units.gu(2)
22
88
88
23
=== modified file 'Launcher/Launcher.qml'
24
--- Launcher/Launcher.qml	2013-06-26 11:25:43 +0000
25
+++ Launcher/Launcher.qml	2013-06-28 16:41:39 +0000
26
@@ -25,7 +25,6 @@
27
25
25
28
26
    property bool available: true // can be used to disable all interactions
26
    property bool available: true // can be used to disable all interactions
29
27
27
30
28
    property bool teasing: false
31
29
    property int panelWidth: units.gu(8.5)
28
    property int panelWidth: units.gu(8.5)
32
30
    property int dragAreaWidth: units.gu(1)
29
    property int dragAreaWidth: units.gu(1)
33
31
    property real progress: dragArea.dragging  && dragArea.touchX > panel.width ? dragArea.touchX : 0
30
    property real progress: dragArea.dragging  && dragArea.touchX > panel.width ? dragArea.touchX : 0
34
@@ -58,8 +57,8 @@
35
58
        animateTimer.start();
57
        animateTimer.start();
36
59
    }
58
    }
37
60
59
40
61
    onTeasingChanged: {
60
    function tease() {
41
62
        if (teasing) {
61
        if (available) {
42
63
            teaseTimer.start();
62
            teaseTimer.start();
43
64
        }
63
        }
44
65
    }
64
    }
45
@@ -244,7 +243,7 @@
46
244
        },
243
        },
47
245
        State {
244
        State {
48
246
            name: "teasing"
245
            name: "teasing"
50
247
            when: root.teasing || teaseTimer.running
246
            when: teaseTimer.running
51
248
            PropertyChanges {
247
            PropertyChanges {
52
249
                target: panel
248
                target: panel
53
250
                x: -root.panelWidth + units.gu(2)
249
                x: -root.panelWidth + units.gu(2)
54
251
250
55
=== modified file 'Shell.qml'
56
--- Shell.qml	2013-06-27 16:25:18 +0000
57
+++ Shell.qml	2013-06-28 16:41:39 +0000
58
@@ -439,6 +439,12 @@
59
439
            var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)
439
            var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)
60
440
            shell.background = bgPath ? bgPath : default_background
440
            shell.background = bgPath ? bgPath : default_background
61
441
        }
441
        }
62
442
63
443
        onLeftTeaserPressedChanged: {
64
444
            if (leftTeaserPressed) {
65
445
                launcher.tease();
66
446
            }
67
447
        }
68
442
    }
448
    }
69
443
449
70
444
    InputFilterArea {
450
    InputFilterArea {
71
@@ -532,7 +538,6 @@
72
532
            width: parent.width
538
            width: parent.width
73
533
            dragAreaWidth: shell.edgeSize
539
            dragAreaWidth: shell.edgeSize
74
534
            available: !greeter.locked
540
            available: !greeter.locked
75
535
            teasing: available && greeter.leftTeaserPressed
76
536
            onDashItemSelected: {
541
            onDashItemSelected: {
77
537
                greeter.hide()
542
                greeter.hide()
78
538
                // Animate if moving between application and dash
543
                // Animate if moving between application and dash
79
539
544
80
=== modified file 'tests/qmltests/Greeter/tst_Phone.qml'
81
--- tests/qmltests/Greeter/tst_Phone.qml	2013-06-13 14:24:52 +0000
82
+++ tests/qmltests/Greeter/tst_Phone.qml	2013-06-28 16:41:39 +0000
83
@@ -28,7 +28,17 @@
84
28
28
85
29
    Greeter {
29
    Greeter {
86
30
        id: greeter
30
        id: greeter
88
31
        anchors.fill: parent
31
        width: parent.width
89
32
        height: parent.height
90
33
        x: 0; y: 0
91
34
92
35
        property int minX: 0
93
36
94
37
        onXChanged: {
95
38
            if (x < minX) {
96
39
                minX = x;
97
40
            }
98
41
        }
99
32
    }
42
    }
100
33
43
101
34
    SignalSpy {
44
    SignalSpy {
102
@@ -63,5 +73,34 @@
103
63
            tryCompare(greeter, "leftTeaserPressed", false)
73
            tryCompare(greeter, "leftTeaserPressed", false)
104
64
            tryCompare(greeter, "rightTeaserPressed", false)
74
            tryCompare(greeter, "rightTeaserPressed", false)
105
65
        }
75
        }
106
76
107
77
        function test_teaseLockedUnlocked_data() {
108
78
            return [
109
79
                {tag: "unlocked", locked: false},
110
80
                {tag: "locked", locked: true}
111
81
            ];
112
82
        }
113
83
114
84
        function test_teaseLockedUnlocked(data) {
115
85
            tryCompare(greeter, "rightTeaserPressed", false);
116
86
            tryCompare(greeter, "x", 0);
117
87
            greeter.locked = data.locked;
118
88
119
89
            mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
120
90
            greeter.minX = 0; // This is needed because the transition actually makes x jump once before animating
121
91
122
92
            if (!data.locked) {
123
93
                // Check if it has been moved over by 2 GUs. Give it a 2 pixel grace area
124
94
                // because animation duration and teaseTimer are the same duration and
125
95
                // might cause slight offsets
126
96
                tryCompareFunction(function() { return greeter.minX <= -units.gu(2) + 2}, true);
127
97
            } else {
128
98
                // waiting 100ms to make sure nothing moves
129
99
                wait(100);
130
100
                compare(greeter.minX, 0, "Greeter moved even tho its locked");
131
101
            }
132
102
            // Wait until we're back to 0
133
103
            tryCompareFunction(function() { return greeter.x;},  0);
134
104
        }
135
66
    }
105
    }
136
67
}
106
}
137
68
107
138
=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
139
--- tests/qmltests/Launcher/tst_Launcher.qml	2013-06-05 22:03:08 +0000
140
+++ tests/qmltests/Launcher/tst_Launcher.qml	2013-06-28 16:41:39 +0000
141
@@ -43,6 +43,18 @@
142
43
        onDashItemSelected: {
43
        onDashItemSelected: {
143
44
            dashItemSelected_count++;
44
            dashItemSelected_count++;
144
45
        }
45
        }
145
46
146
47
        property int maxPanelX: 0
147
48
    }
148
49
149
50
    Connections {
150
51
        target: testCase.findChild(launcher, "launcherPanel")
151
52
152
53
        onXChanged: {
153
54
            if (target.x > launcher.maxPanelX) {
154
55
                launcher.maxPanelX = target.x;
155
56
            }
156
57
        }
157
46
    }
58
    }
158
47
59
159
48
    UT.UnityTestCase {
60
    UT.UnityTestCase {
160
@@ -126,5 +138,33 @@
161
126
            var panel = findChild(launcher, "launcherPanel")
138
            var panel = findChild(launcher, "launcherPanel")
162
127
            tryCompare(panel, "x", -panel.width, 1000)
139
            tryCompare(panel, "x", -panel.width, 1000)
163
128
        }
140
        }
164
141
165
142
166
143
        function test_teaseLauncher_data() {
167
144
            return [
168
145
                {tag: "available", available: true},
169
146
                {tag: "not available", available: false}
170
147
            ];
171
148
        }
172
149
173
150
        function test_teaseLauncher(data) {
174
151
            launcher.available = data.available;
175
152
            launcher.maxPanelX = -launcher.panelWidth;
176
153
            launcher.tease();
177
154
178
155
            if (data.available) {
179
156
                // Check if the launcher slides in for units.gu(2). However, as the animation is 200ms
180
157
                // and the teaseTimer's timeout too, give it a 2 pixels grace distance
181
158
                tryCompareFunction(
182
159
                    function(){
183
160
                        return launcher.maxPanelX >= -launcher.panelWidth + units.gu(2) - 2;
184
161
                    },
185
162
                    true)
186
163
            } else {
187
164
                wait(100)
188
165
                compare(launcher.maxPanelX, -launcher.panelWidth, "Launcher moved even if it shouldn't")
189
166
            }
190
167
            waitUntilLauncherDisappears();
191
168
        }
192
129
    }
169
    }
193
130
}
170
}
Status:	Merged
Approved by:	Michał Sawicz on 2013-07-01
Approved revision:	63
Merged at revision:	67
Proposed branch:	lp:~mzanetti/unity8/edge-hinting-tweaks
Merge into:	lp:unity8
Diff against target:	193 lines (+91/-8) 5 files modified Greeter/Greeter.qml (+2/-2) Launcher/Launcher.qml (+3/-4) Shell.qml (+6/-1) tests/qmltests/Greeter/tst_Phone.qml (+40/-1) tests/qmltests/Launcher/tst_Launcher.qml (+40/-0)
To merge this branch:	bzr merge lp:~mzanetti/unity8/edge-hinting-tweaks
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-01
Daniel d'Andrada (community)		2013-06-28	Approve on 2013-06-28
Review via email: mp+172014@code.launchpad.net
1	=== modified file 'Greeter/Greeter.qml'
2	--- Greeter/Greeter.qml 2013-06-19 08:29:34 +0000
3	+++ Greeter/Greeter.qml 2013-06-28 16:41:39 +0000
4	@@ -48,7 +48,7 @@
5	48	signal unlocked(int uid)	48	signal unlocked(int uid)
6	49		49
7	50	onRightTeaserPressedChanged: {	50	onRightTeaserPressedChanged: {
9	51	if (rightTeaserPressed) {	51	if (rightTeaserPressed && !locked) {
10	52	teasingTimer.start();	52	teasingTimer.start();
11	53	}	53	}
12	54	}	54	}
13	@@ -81,7 +81,7 @@
14	81	states: [	81	states: [
15	82	State {	82	State {
16	83	name: "teasing"	83	name: "teasing"
18	84	when: greeter.rightTeaserPressed \|\| teasingTimer.running	84	when: teasingTimer.running
19	85	PropertyChanges {	85	PropertyChanges {
20	86	target: greeter	86	target: greeter
21	87	x: -units.gu(2)	87	x: -units.gu(2)
22	88		88
23	=== modified file 'Launcher/Launcher.qml'
24	--- Launcher/Launcher.qml 2013-06-26 11:25:43 +0000
25	+++ Launcher/Launcher.qml 2013-06-28 16:41:39 +0000
26	@@ -25,7 +25,6 @@
27	25		25
28	26	property bool available: true // can be used to disable all interactions	26	property bool available: true // can be used to disable all interactions
29	27		27
30	28	property bool teasing: false
31	29	property int panelWidth: units.gu(8.5)	28	property int panelWidth: units.gu(8.5)
32	30	property int dragAreaWidth: units.gu(1)	29	property int dragAreaWidth: units.gu(1)
33	31	property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0	30	property real progress: dragArea.dragging && dragArea.touchX > panel.width ? dragArea.touchX : 0
34	@@ -58,8 +57,8 @@
35	58	animateTimer.start();	57	animateTimer.start();
36	59	}	58	}
37	60		59
40	61	onTeasingChanged: {	60	function tease() {
41	62	if (teasing) {	61	if (available) {
42	63	teaseTimer.start();	62	teaseTimer.start();
43	64	}	63	}
44	65	}	64	}
45	@@ -244,7 +243,7 @@
46	244	},	243	},
47	245	State {	244	State {
48	246	name: "teasing"	245	name: "teasing"
50	247	when: root.teasing \|\| teaseTimer.running	246	when: teaseTimer.running
51	248	PropertyChanges {	247	PropertyChanges {
52	249	target: panel	248	target: panel
53	250	x: -root.panelWidth + units.gu(2)	249	x: -root.panelWidth + units.gu(2)
54	251		250
55	=== modified file 'Shell.qml'
56	--- Shell.qml 2013-06-27 16:25:18 +0000
57	+++ Shell.qml 2013-06-28 16:41:39 +0000
58	@@ -439,6 +439,12 @@
59	439	var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)	439	var bgPath = greeter.model.data(uid, LightDM.UserRoles.BackgroundPathRole)
60	440	shell.background = bgPath ? bgPath : default_background	440	shell.background = bgPath ? bgPath : default_background
61	441	}	441	}
62			442
63			443	onLeftTeaserPressedChanged: {
64			444	if (leftTeaserPressed) {
65			445	launcher.tease();
66			446	}
67			447	}
68	442	}	448	}
69	443		449
70	444	InputFilterArea {	450	InputFilterArea {
71	@@ -532,7 +538,6 @@
72	532	width: parent.width	538	width: parent.width
73	533	dragAreaWidth: shell.edgeSize	539	dragAreaWidth: shell.edgeSize
74	534	available: !greeter.locked	540	available: !greeter.locked
75	535	teasing: available && greeter.leftTeaserPressed
76	536	onDashItemSelected: {	541	onDashItemSelected: {
77	537	greeter.hide()	542	greeter.hide()
78	538	// Animate if moving between application and dash	543	// Animate if moving between application and dash
79	539		544
80	=== modified file 'tests/qmltests/Greeter/tst_Phone.qml'
81	--- tests/qmltests/Greeter/tst_Phone.qml 2013-06-13 14:24:52 +0000
82	+++ tests/qmltests/Greeter/tst_Phone.qml 2013-06-28 16:41:39 +0000
83	@@ -28,7 +28,17 @@
84	28		28
85	29	Greeter {	29	Greeter {
86	30	id: greeter	30	id: greeter
88	31	anchors.fill: parent	31	width: parent.width
89			32	height: parent.height
90			33	x: 0; y: 0
91			34
92			35	property int minX: 0
93			36
94			37	onXChanged: {
95			38	if (x < minX) {
96			39	minX = x;
97			40	}
98			41	}
99	32	}	42	}
100	33		43
101	34	SignalSpy {	44	SignalSpy {
102	@@ -63,5 +73,34 @@
103	63	tryCompare(greeter, "leftTeaserPressed", false)	73	tryCompare(greeter, "leftTeaserPressed", false)
104	64	tryCompare(greeter, "rightTeaserPressed", false)	74	tryCompare(greeter, "rightTeaserPressed", false)
105	65	}	75	}
106			76
107			77	function test_teaseLockedUnlocked_data() {
108			78	return [
109			79	{tag: "unlocked", locked: false},
110			80	{tag: "locked", locked: true}
111			81	];
112			82	}
113			83
114			84	function test_teaseLockedUnlocked(data) {
115			85	tryCompare(greeter, "rightTeaserPressed", false);
116			86	tryCompare(greeter, "x", 0);
117			87	greeter.locked = data.locked;
118			88
119			89	mouseClick(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
120			90	greeter.minX = 0; // This is needed because the transition actually makes x jump once before animating
121			91
122			92	if (!data.locked) {
123			93	// Check if it has been moved over by 2 GUs. Give it a 2 pixel grace area
124			94	// because animation duration and teaseTimer are the same duration and
125			95	// might cause slight offsets
126			96	tryCompareFunction(function() { return greeter.minX <= -units.gu(2) + 2}, true);
127			97	} else {
128			98	// waiting 100ms to make sure nothing moves
129			99	wait(100);
130			100	compare(greeter.minX, 0, "Greeter moved even tho its locked");
131			101	}
132			102	// Wait until we're back to 0
133			103	tryCompareFunction(function() { return greeter.x;}, 0);
134			104	}
135	66	}	105	}
136	67	}	106	}
137	68		107
138	=== modified file 'tests/qmltests/Launcher/tst_Launcher.qml'
139	--- tests/qmltests/Launcher/tst_Launcher.qml 2013-06-05 22:03:08 +0000
140	+++ tests/qmltests/Launcher/tst_Launcher.qml 2013-06-28 16:41:39 +0000
141	@@ -43,6 +43,18 @@
142	43	onDashItemSelected: {	43	onDashItemSelected: {
143	44	dashItemSelected_count++;	44	dashItemSelected_count++;
144	45	}	45	}
145			46
146			47	property int maxPanelX: 0
147			48	}
148			49
149			50	Connections {
150			51	target: testCase.findChild(launcher, "launcherPanel")
151			52
152			53	onXChanged: {
153			54	if (target.x > launcher.maxPanelX) {
154			55	launcher.maxPanelX = target.x;
155			56	}
156			57	}
157	46	}	58	}
158	47		59
159	48	UT.UnityTestCase {	60	UT.UnityTestCase {
160	@@ -126,5 +138,33 @@
161	126	var panel = findChild(launcher, "launcherPanel")	138	var panel = findChild(launcher, "launcherPanel")
162	127	tryCompare(panel, "x", -panel.width, 1000)	139	tryCompare(panel, "x", -panel.width, 1000)
163	128	}	140	}
164			141
165			142
166			143	function test_teaseLauncher_data() {
167			144	return [
168			145	{tag: "available", available: true},
169			146	{tag: "not available", available: false}
170			147	];
171			148	}
172			149
173			150	function test_teaseLauncher(data) {
174			151	launcher.available = data.available;
175			152	launcher.maxPanelX = -launcher.panelWidth;
176			153	launcher.tease();
177			154
178			155	if (data.available) {
179			156	// Check if the launcher slides in for units.gu(2). However, as the animation is 200ms
180			157	// and the teaseTimer's timeout too, give it a 2 pixels grace distance
181			158	tryCompareFunction(
182			159	function(){
183			160	return launcher.maxPanelX >= -launcher.panelWidth + units.gu(2) - 2;
184			161	},
185			162	true)
186			163	} else {
187			164	wait(100)
188			165	compare(launcher.maxPanelX, -launcher.panelWidth, "Launcher moved even if it shouldn't")
189			166	}
190			167	waitUntilLauncherDisappears();
191			168	}
192	129	}	169	}
193	130	}	170	}