1
=== modified file 'qml/Dash/Dash.qml'
2
--- qml/Dash/Dash.qml	2015-11-19 16:55:31 +0000
3
+++ qml/Dash/Dash.qml	2016-02-15 10:15:31 +0000
4
@@ -37,6 +37,7 @@
5
37
    }
37
    }
6
38
38
7
39
    property bool windowActive: window.active
39
    property bool windowActive: window.active
8
40
    property bool showOverlayScope: false
9
40
41
10
41
    DashCommunicatorService {
42
    DashCommunicatorService {
11
42
        objectName: "dashCommunicatorService"
43
        objectName: "dashCommunicatorService"
12
@@ -80,7 +81,7 @@
13
80
            return
81
            return
14
81
        }
82
        }
15
82
83
17
83
        closeOverlayScope();
84
        dash.showOverlayScope = false;
18
84
85
19
85
        dashContent.closePreview();
86
        dashContent.closePreview();
20
86
87
21
@@ -93,12 +94,6 @@
22
93
        dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
94
        dashContent.setCurrentScopeAtIndex(scopeIndex, animate, reset)
23
94
    }
95
    }
24
95
96
25
96
    function closeOverlayScope() {
26
97
        if (dashContent.x != 0) {
27
98
            dashContent.x = 0;
28
99
        }
29
100
    }
30
101
31
102
    Scopes {
97
    Scopes {
32
103
        id: scopes
98
        id: scopes
33
104
    }
99
    }
34
@@ -133,12 +128,13 @@
35
133
        height: dash.height
128
        height: dash.height
36
134
        scopes: scopes
129
        scopes: scopes
37
135
        visible: x != -width
130
        visible: x != -width
38
131
        x: dash.showOverlayScope ? -width : 0
39
136
        onGotoScope: {
132
        onGotoScope: {
40
137
            dash.setCurrentScope(scopeId, true, false);
133
            dash.setCurrentScope(scopeId, true, false);
41
138
        }
134
        }
42
139
        onOpenScope: {
135
        onOpenScope: {
43
140
            scopeItem.scope = scope;
136
            scopeItem.scope = scope;
45
141
            x = -width;
137
            dash.showOverlayScope = true;
46
142
        }
138
        }
47
143
        Behavior on x {
139
        Behavior on x {
48
144
            UbuntuNumberAnimation {
140
            UbuntuNumberAnimation {
49
@@ -207,7 +203,7 @@
50
207
                bottomEdgeController.enableAnimation = true;
203
                bottomEdgeController.enableAnimation = true;
51
208
                bottomEdgeController.progress = 0;
204
                bottomEdgeController.progress = 0;
52
209
                scopeItem.scope = scope;
205
                scopeItem.scope = scope;
54
210
                dashContent.x = -dashContent.width;
206
                dash.showOverlayScope = true;
55
211
            }
207
            }
56
212
            onGotoScope: {
208
            onGotoScope: {
57
213
                bottomEdgeController.enableAnimation = true;
209
                bottomEdgeController.enableAnimation = true;
58
@@ -226,7 +222,7 @@
59
226
        id: scopeItem
222
        id: scopeItem
60
227
        objectName: "dashTempScopeItem"
223
        objectName: "dashTempScopeItem"
61
228
224
63
229
        x: dashContent.x + width
225
        x: dash.showOverlayScope ? 0 : width
64
230
        y: dashContent.y
226
        y: dashContent.y
65
231
        width: parent.width
227
        width: parent.width
66
232
        height: parent.height
228
        height: parent.height
67
@@ -234,7 +230,7 @@
68
234
        hasBackAction: true
230
        hasBackAction: true
69
235
        isCurrent: visible
231
        isCurrent: visible
70
236
        onBackClicked: {
232
        onBackClicked: {
72
237
            closeOverlayScope();
233
            dash.showOverlayScope = false;
73
238
            closePreview();
234
            closePreview();
74
239
        }
235
        }
75
240
236
76
@@ -250,6 +246,10 @@
77
250
                scopes.closeScope(oldScope);
246
                scopes.closeScope(oldScope);
78
251
            }
247
            }
79
252
        }
248
        }
80
249
81
250
        Behavior on x {
82
251
            UbuntuNumberAnimation { }
83
252
        }
84
253
    }
253
    }
85
254
254
86
255
    Rectangle {
255
    Rectangle {
87
256
256
88
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
89
--- tests/qmltests/Dash/tst_Dash.qml	2015-12-11 09:10:01 +0000
90
+++ tests/qmltests/Dash/tst_Dash.qml	2016-02-15 10:15:31 +0000
91
@@ -70,6 +70,42 @@
92
70
            waitForRendering(findChild(dash, "scopeLoader0").item);
70
            waitForRendering(findChild(dash, "scopeLoader0").item);
93
71
        }
71
        }
94
72
72
95
73
        function scrollToCategory(categoryName) {
96
74
            var dashContentList = findChild(dash, "dashContentList");
97
75
            var genericScopeView = dashContentList.currentItem;
98
76
            var categoryListView = findChild(genericScopeView, "categoryListView");
99
77
            tryCompareFunction(function() {
100
78
                var category = findChild(genericScopeView, categoryName);
101
79
                if (category && category.y > 0 && category.y < genericScopeView.height) return true;
102
80
                touchFlick(genericScopeView, genericScopeView.width/2, units.gu(20),
103
81
                            genericScopeView.width/2, genericScopeView.y)
104
82
                tryCompare(categoryListView, "moving", false);
105
83
                return false;
106
84
            }, true);
107
85
108
86
            tryCompareFunction(function() { return findChild(genericScopeView, "delegate0") !== null; }, true);
109
87
            return findChild(genericScopeView, categoryName);
110
88
        }
111
89
112
90
        function clickCategoryDelegate(category, delegate) {
113
91
            var dashContentList = findChild(dash, "dashContentList");
114
92
            var genericScopeView = dashContentList.currentItem;
115
93
            if (category === undefined) category = 0;
116
94
            if (delegate === undefined) delegate = 0;
117
95
            tryCompareFunction(function() {
118
96
                                    var cardGrid = findChild(genericScopeView, "dashCategory"+category);
119
97
                                    if (cardGrid != null) {
120
98
                                        var tile = findChild(cardGrid, "delegate"+delegate);
121
99
                                        return tile != null;
122
100
                                    }
123
101
                                    return false;
124
102
                                },
125
103
                                true);
126
104
            var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
127
105
            waitForRendering(tile);
128
106
            mouseClick(tile);
129
107
        }
130
108
131
73
        function test_manage_dash_clickscope_unfavoritable() {
109
        function test_manage_dash_clickscope_unfavoritable() {
132
74
            // Show the manage dash
110
            // Show the manage dash
133
75
            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
111
            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
134
@@ -565,5 +601,58 @@
135
565
            tryCompare(dashTempScopeItem, "x", dashTempScopeItem.width);
601
            tryCompare(dashTempScopeItem, "x", dashTempScopeItem.width);
136
566
            tryCompare(dashTempScopeItem, "visible", false);
602
            tryCompare(dashTempScopeItem, "visible", false);
137
567
        }
603
        }
138
604
139
605
        function test_openScope()
140
606
        {
141
607
            scrollToCategory("dashCategory2");
142
608
            clickCategoryDelegate(2, 2);
143
609
144
610
            var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
145
611
            tryCompare(dashTempScopeItem, "x", 0);
146
612
            tryCompare(dashTempScopeItem, "visible", true);
147
613
            tryCompare(dashContent, "x", -dash.width);
148
614
149
615
            // Go back
150
616
            var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
151
617
            var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
152
618
            mouseClick(backButton);
153
619
154
620
            // Check temp scope is gone
155
621
            tryCompare(dashTempScopeItem, "x", dash.width);
156
622
            tryCompare(dashTempScopeItem, "visible", false);
157
623
            tryCompare(dashContent, "x", 0);
158
624
        }
159
625
160
626
        function test_tempScopeItemXOnResize()
161
627
        {
162
628
            // Go to a temp scope
163
629
            touchFlick(dash, dash.width / 2, dash.height - 1, dash.width / 2, units.gu(2));
164
630
            var bottomEdgeController = findInvisibleChild(dash, "bottomEdgeController");
165
631
            tryCompare(bottomEdgeController, "progress", 1);
166
632
            var nonfavScopesListCategory = findChild(dash, "scopesListCategoryother");
167
633
            var nonfavScopesListCategoryList = findChild(nonfavScopesListCategory, "scopesListCategoryInnerList");
168
634
            tryCompare(nonfavScopesListCategoryList, "currentIndex", 0);
169
635
            mouseClick(nonfavScopesListCategoryList.currentItem);
170
636
            var dashTempScopeItem = findChild(dash, "dashTempScopeItem");
171
637
            tryCompare(dashTempScopeItem, "x", 0);
172
638
            tryCompare(dashTempScopeItem, "visible", true);
173
639
174
640
            shell.width = units.gu(80);
175
641
            tryCompare(dashTempScopeItem, "x", 0);
176
642
            tryCompare(dashContent, "x", -dash.width);
177
643
178
644
            shell.width = units.gu(40);
179
645
            tryCompare(dashTempScopeItem, "x", 0);
180
646
181
647
            // Go back
182
648
            var dashTempScopeItemHeader = findChild(dashTempScopeItem, "scopePageHeader");
183
649
            var backButton = findChild(findChild(dashTempScopeItemHeader, "innerPageHeader"), "customBackButton");
184
650
            mouseClick(backButton);
185
651
186
652
            // Check temp scope is gone
187
653
            tryCompare(dashTempScopeItem, "x", dash.width);
188
654
            tryCompare(dashTempScopeItem, "visible", false);
189
655
            tryCompare(dashContent, "x", 0);
190
656
        }
191
568
    }
657
    }
192
569
}
658
}
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2016-02-09	Approve on 2016-02-17
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-15
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-02-15
Michał Sawicz			Needs Fixing on 2016-02-11
Review via email: mp+285453@code.launchpad.net