1
=== modified file 'src/Ubuntu/Components/plugin/ucmainviewbase.cpp'
2
--- src/Ubuntu/Components/plugin/ucmainviewbase.cpp	2016-04-04 04:47:11 +0000
3
+++ src/Ubuntu/Components/plugin/ucmainviewbase.cpp	2016-05-09 09:15:00 +0000
4
@@ -53,7 +53,9 @@
5
53
53
6
54
    m_actionContext->setObjectName(QStringLiteral("RootContext"));
54
    m_actionContext->setObjectName(QStringLiteral("RootContext"));
7
55
    m_actionContext->setActive(true);
55
    m_actionContext->setActive(true);
9
56
    q->setActive(true);
56
    // setActive(true) is called in componentComplete to wait
10
57
    // until the MainView (and all its children) are complete
11
58
    // to prevent bug #1570886.
12
57
59
13
58
    QObject::connect(m_actionManager,&UCActionManager::quit, [](){
60
    QObject::connect(m_actionManager,&UCActionManager::quit, [](){
14
59
        // FIXME Wire this up to the application lifecycle management API instead of quit().
61
        // FIXME Wire this up to the application lifecycle management API instead of quit().
15
@@ -307,6 +309,9 @@
16
307
{
309
{
17
308
    Q_D(UCMainViewBase);
310
    Q_D(UCMainViewBase);
18
309
    UCPageTreeNode::componentComplete();
311
    UCPageTreeNode::componentComplete();
19
312
    // Do not call setActive() in d->init() but postpone until the
20
313
    // component is complete to avoid bug #1570886.
21
314
    this->setActive(true);
22
310
    d->doAutoTheme();
315
    d->doAutoTheme();
23
311
316
24
312
    if (d->m_actionContext)
317
    if (d->m_actionContext)
25
313
318
26
=== added file 'tests/unit_x11/tst_components/tst_tabs11.qml'
27
--- tests/unit_x11/tst_components/tst_tabs11.qml	1970-01-01 00:00:00 +0000
28
+++ tests/unit_x11/tst_components/tst_tabs11.qml	2016-05-09 09:15:00 +0000
29
@@ -0,0 +1,198 @@
30
1
/*
31
2
 * Copyright 2012-2016 Canonical Ltd.
32
3
 *
33
4
 * This program is free software; you can redistribute it and/or modify
34
5
 * it under the terms of the GNU Lesser General Public License as published by
35
6
 * the Free Software Foundation; version 3.
36
7
 *
37
8
 * This program is distributed in the hope that it will be useful,
38
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
39
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
40
11
 * GNU Lesser General Public License for more details.
41
12
 *
42
13
 * You should have received a copy of the GNU Lesser General Public License
43
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
44
15
 */
45
16
46
17
import QtQuick 2.2
47
18
import Ubuntu.Test 1.0
48
19
import Ubuntu.Components 1.1
49
20
50
21
MainView {
51
22
    id: mainView
52
23
    width: units.gu(50)
53
24
    height: units.gu(80)
54
25
    useDeprecatedToolbar: false
55
26
56
27
    Tabs {
57
28
        id: tabs
58
29
        Tab {
59
30
            id: tab1
60
31
            title: "tab 1"
61
32
            page: Page {
62
33
                id: page1
63
34
                Button {
64
35
                    id: button
65
36
                    anchors.centerIn: parent
66
37
                    text: "click"
67
38
                }
68
39
            }
69
40
        }
70
41
        Tab {
71
42
            id: tab2
72
43
            title: "tab 2"
73
44
            page: Page {
74
45
                id: page2
75
46
            }
76
47
        }
77
48
        Tab {
78
49
            id: tab3
79
50
            title: "tab 3"
80
51
            page: Page {
81
52
                id: page3
82
53
            }
83
54
        }
84
55
        Tab {
85
56
            id: tabFlick1
86
57
            title: "flick"
87
58
            page: Page {
88
59
                Flickable {
89
60
                    id: flickable1
90
61
                    anchors.fill: parent
91
62
                }
92
63
            }
93
64
        }
94
65
        Tab {
95
66
            id: tabFlick2
96
67
            title: "flick 2"
97
68
            page: Page {
98
69
                Flickable {
99
70
                    id: flickable2
100
71
                    anchors.fill: parent
101
72
                }
102
73
            }
103
74
        }
104
75
        Tab {
105
76
            id: tabFlickLoader
106
77
            title: "load"
107
78
            page: Loader {
108
79
                id: loader
109
80
                sourceComponent: tabs.selectedTabIndex != 5 ? null : pageComponent
110
81
            }
111
82
        }
112
83
        Tab {
113
84
            id: tabNoFlickLoader
114
85
            title: "loadNoFlick"
115
86
            page: Loader {
116
87
                id: loaderNoFlick
117
88
                anchors {
118
89
                    left: parent.left
119
90
                    right: parent.right
120
91
                    bottom: parent.bottom
121
92
                }
122
93
                // height compes from the loaded Page
123
94
                sourceComponent: tabs.selectedTabIndex === 6 ? pageComponentNoFlick : null
124
95
            }
125
96
        }
126
97
        Tab {
127
98
            // Test for bug #1570886, see initTestCase().
128
99
            id: tabWithTitleFromPage
129
100
            page: Page {
130
101
                title: "Title from Page"
131
102
            }
132
103
        }
133
104
    }
134
105
    Component {
135
106
        id: pageComponent
136
107
        Page {
137
108
            title: "Loaded page"
138
109
            property Flickable flick: loadedFlickable
139
110
            Flickable {
140
111
                id: loadedFlickable
141
112
                anchors.fill: parent
142
113
                contentHeight: 1000
143
114
            }
144
115
        }
145
116
    }
146
117
    Component {
147
118
        id: pageComponentNoFlick
148
119
        Page {
149
120
            title: "Loaded page without flickable"
150
121
        }
151
122
    }
152
123
153
124
    UbuntuTestCase {
154
125
        name: "TabsAPINewHeader"
155
126
        when: windowShown
156
127
157
128
        function initTestCase() {
158
129
            // Test for bug #1570886.
159
130
            compare(mainView.__propagated.header.title, tab1.title,
160
131
                     "Incorrect initial header title.");
161
132
        }
162
133
163
134
        function test_tabsDefaults() {
164
135
            compare(tabs.selectedTabIndex, 0, "The default selectedTabIndex is 0 when Tabs has contents");
165
136
            compare(tabs.selectedTab, tab1, "The default selectedTab is the first tab");
166
137
            compare(tabs.currentPage, page1, "The default currentPage is the page of the first tab");
167
138
        }
168
139
169
140
        function test_tabsSetSelectedTab() {
170
141
            var tabArray = [tab1, tab2, tab3];
171
142
            var pageArray = [page1, page2, page3];
172
143
            for (var i=0; i < 3; i++) {
173
144
                tabs.selectedTabIndex = i;
174
145
                compare(tabs.selectedTabIndex, i, "Can set selectedTabIndex");
175
146
                compare(tabs.selectedTab, tabArray[i], "Can update selectedTab by setting selectedTabIndex");
176
147
                compare(tabs.currentPage, pageArray[i], "Can update currentPage by setting selectedTabIndex");
177
148
                for (var j=0; j < 3; j++) {
178
149
                    compare(pageArray[j].active, j===i, "Only the page of the selected tab is active");
179
150
                }
180
151
            }
181
152
        }
182
153
183
154
        function test_flickable() {
184
155
            // ensure that the flickable of the header is set to the flickable of the selected tab.
185
156
            tabs.selectedTabIndex = 3;
186
157
            compare(mainView.__propagated.header.flickable, flickable1, "Header flickable correctly initialized");
187
158
            tabs.selectedTabIndex = 4;
188
159
            compare(mainView.__propagated.header.flickable, flickable2, "Header flickable correctly updated");
189
160
            tabs.selectedTabIndex = 0;
190
161
        }
191
162
192
163
        function test_pageLoader() {
193
164
            tabs.selectedTabIndex = 0;
194
165
            compare(loader.item, null, "Page not loaded when tab is not selected");
195
166
            tabs.selectedTabIndex = 5;
196
167
            compare(tabs.currentPage, loader, "Selected loader for current page");
197
168
            compare(loader.item.title, "Loaded page", "Loaded item is a page");
198
169
            tabs.selectedTabIndex = 0;
199
170
            compare(loader.item, null, "Loaded page was properly unloaded");
200
171
        }
201
172
202
173
        function test_bug1088740() {
203
174
            tabs.selectedTabIndex = 5;
204
175
            compare(mainView.__propagated.header.flickable, loader.item.flick, "Header flickable correctly updated with Loader");
205
176
            compare(loader.item.flick.contentHeight, 1000, "Header flickable is correct flickable");
206
177
            tabs.selectedTabIndex = 0;
207
178
        }
208
179
209
180
        function test_pageHeightLoaderNoFlick_bug1259917() {
210
181
            tabs.selectedTabIndex = 6;
211
182
            compare(tabs.selectedTab, tabNoFlickLoader, "Tab 6 was selected.");
212
183
            compare(mainView.__propagated.header.flickable, null, "Loaded page without flickable.");
213
184
            compare(loaderNoFlick.item.height, mainView.height - mainView.__propagated.header.height,
214
185
                    "Correct height for loaded Page without flickable.");
215
186
        }
216
187
217
188
        function test_index() {
218
189
            compare(tab1.index, 0, "tab1 is at 0");
219
190
            compare(tab2.index, 1, "tab2 is at 1");
220
191
            compare(tab3.index, 2, "tab3 is at 2");
221
192
            compare(tabFlick1.index, 3, "tabFlick1 is at 3");
222
193
            compare(tabFlick2.index, 4, "tabFlick2 is at 4");
223
194
            compare(tabFlickLoader.index, 5, "tabFlickLoader is at 5");
224
195
            compare(tabNoFlickLoader.index, 6, "tabNoFlickLoader is at 6");
225
196
        }
226
197
    }
227
198
}
228
0
199
229
=== renamed file 'tests/unit_x11/tst_components/tst_tabs.qml' => 'tests/unit_x11/tst_components/tst_tabs13.qml'
230
--- tests/unit_x11/tst_components/tst_tabs.qml	2015-09-03 11:44:38 +0000
231
+++ tests/unit_x11/tst_components/tst_tabs13.qml	2016-05-09 09:15:00 +0000
232
@@ -1,5 +1,5 @@
233
1
/*
1
/*
235
2
 * Copyright 2012-2014 Canonical Ltd.
2
 * Copyright 2016 Canonical Ltd.
236
3
 *
3
 *
237
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
238
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
239
@@ -14,15 +14,14 @@
240
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
241
15
 */
15
 */
242
16
16
244
17
import QtQuick 2.2
17
import QtQuick 2.4
245
18
import Ubuntu.Test 1.0
18
import Ubuntu.Test 1.0
247
19
import Ubuntu.Components 1.1
19
import Ubuntu.Components 1.3
248
20
20
249
21
MainView {
21
MainView {
250
22
    id: mainView
22
    id: mainView
251
23
    width: units.gu(50)
23
    width: units.gu(50)
252
24
    height: units.gu(80)
24
    height: units.gu(80)
253
25
    useDeprecatedToolbar: false
254
26
25
255
27
    Tabs {
26
    Tabs {
256
28
        id: tabs
27
        id: tabs
257
@@ -94,6 +93,13 @@
258
94
                sourceComponent: tabs.selectedTabIndex === 6 ? pageComponentNoFlick : null
93
                sourceComponent: tabs.selectedTabIndex === 6 ? pageComponentNoFlick : null
259
95
            }
94
            }
260
96
        }
95
        }
261
96
        Tab {
262
97
            // Test for bug #1570886, see initTestCase().
263
98
            id: tabWithTitleFromPage
264
99
            page: Page {
265
100
                title: "Title from Page"
266
101
            }
267
102
        }
268
97
    }
103
    }
269
98
    Component {
104
    Component {
270
99
        id: pageComponent
105
        id: pageComponent
271
@@ -118,6 +124,12 @@
272
118
        name: "TabsAPINewHeader"
124
        name: "TabsAPINewHeader"
273
119
        when: windowShown
125
        when: windowShown
274
120
126
275
127
        function initTestCase() {
276
128
            // Test for bug #1570886.
277
129
            compare(mainView.__propagated.header.title, tab1.title,
278
130
                     "Incorrect initial header title.");
279
131
        }
280
132
281
121
        function test_tabsDefaults() {
133
        function test_tabsDefaults() {
282
122
            compare(tabs.selectedTabIndex, 0, "The default selectedTabIndex is 0 when Tabs has contents");
134
            compare(tabs.selectedTabIndex, 0, "The default selectedTabIndex is 0 when Tabs has contents");
283
123
            compare(tabs.selectedTab, tab1, "The default selectedTab is the first tab");
135
            compare(tabs.selectedTab, tab1, "The default selectedTab is the first tab");
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-05-11
Benjamin Zeller		2016-05-02	Approve on 2016-05-04
Review via email: mp+293556@code.launchpad.net