1
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Template.qml'
2
--- examples/ubuntu-ui-toolkit-gallery/Template.qml	2016-01-13 16:14:08 +0000
3
+++ examples/ubuntu-ui-toolkit-gallery/Template.qml	2016-03-24 10:43:42 +0000
4
@@ -34,19 +34,16 @@
5
34
    }
34
    }
6
35
35
7
36
    ScrollView {
36
    ScrollView {
8
37
        //anchors.fill: parent
9
38
        //anchors.topMargin: template.header.flickable ? 0 : template.header.height
10
39
        objectName: "TemplateScrollView"
37
        objectName: "TemplateScrollView"
11
40
        anchors {
38
        anchors {
12
41
            fill: parent
39
            fill: parent
13
42
            topMargin: template.header.flickable ? 0 : template.header.height
40
            topMargin: template.header.flickable ? 0 : template.header.height
14
43
        }
41
        }
15
42
16
44
        Flickable {
43
        Flickable {
17
45
            id: templateFlickable
44
            id: templateFlickable
18
46
            objectName: "TemplateFlickable"
45
            objectName: "TemplateFlickable"
19
47
            anchors.fill: parent
46
            anchors.fill: parent
20
48
            topMargin: units.gu(2)
21
49
            bottomMargin: units.gu(2)
22
50
            contentHeight: column.height
47
            contentHeight: column.height
23
51
            interactive: contentHeight > height
48
            interactive: contentHeight > height
24
52
            Column {
49
            Column {
25
53
50
26
=== modified file 'src/Ubuntu/Components/1.3/ScrollView.qml'
27
--- src/Ubuntu/Components/1.3/ScrollView.qml	2016-02-18 12:39:14 +0000
28
+++ src/Ubuntu/Components/1.3/ScrollView.qml	2016-03-24 10:43:42 +0000
29
@@ -30,6 +30,13 @@
30
30
    migrate to ScrollView, to ensure the UX is ready for convergent devices and is consistent with the
30
    migrate to ScrollView, to ensure the UX is ready for convergent devices and is consistent with the
31
31
    rest of the platform.
31
    rest of the platform.
32
32
32
33
33
    ScrollView wraps \l {Scrollbar}(s) in a view, and provides additional features such as:
34
34
    \list
35
35
    \li - Keyboard navigation and focus handling, for a complete convergent experience.
36
36
    \li - Automatic position handling of vertical and horizontal scrollbars, preventing them from
37
37
          overlapping one another when both on screen.
38
38
    \endlist
39
39
40
33
    Adding scrollbars and keyboard input handling to a QML item is as simple as wrapping that item in a
40
    Adding scrollbars and keyboard input handling to a QML item is as simple as wrapping that item in a
41
34
    ScrollView, as shown in the following example:
41
    ScrollView, as shown in the following example:
42
35
42
43
36
43
44
=== modified file 'src/Ubuntu/Components/1.3/Scrollbar.qml'
45
--- src/Ubuntu/Components/1.3/Scrollbar.qml	2016-02-25 12:59:27 +0000
46
+++ src/Ubuntu/Components/1.3/Scrollbar.qml	2016-03-24 10:43:42 +0000
47
@@ -18,14 +18,19 @@
48
18
import Ubuntu.Components 1.3 as Toolkit
18
import Ubuntu.Components 1.3 as Toolkit
49
19
19
50
20
/*!
20
/*!
52
21
    \qmltype ScrollBar
21
    \qmltype Scrollbar
53
22
    \inqmlmodule Ubuntu.Components 1.1
22
    \inqmlmodule Ubuntu.Components 1.1
54
23
    \ingroup ubuntu
23
    \ingroup ubuntu
56
24
    \brief The ScrollBar component provides scrolling functionality for
24
    \brief The Scrollbar component provides scrolling functionality for
57
25
    scrollable views (i.e. Flickable, ListView).
25
    scrollable views (i.e. Flickable, ListView).
58
26
26
61
27
    The ScrollBar can be set to any flickable and has built-in anchoring setup
27
    \b NOTE: the Scrollbar component was revamped for OTA9 and used for the implementation
62
28
    to the attached flickable's front, rear, top or bottom. the scrollbar can
28
    of \l ScrollView. Apps targeting system version OTA9 (or newer) should use ScrollView instead
63
29
    of Scrollbar, as it features convergent-ready features, such as (but not limited to)
64
30
    keyboard input handling.
65
31
66
32
    The Scrollbar can be set to any flickable and has built-in anchoring setup
67
33
    to the attached flickable's front, rear, top or bottom. The scrollbar can
68
29
    also be aligned using anchors, however the built-in align functionality
34
    also be aligned using anchors, however the built-in align functionality
69
30
    makes sure to have the proper alignemt applied based on theme and layout
35
    makes sure to have the proper alignemt applied based on theme and layout
70
31
    direction (RTL or LTR).
36
    direction (RTL or LTR).
71
@@ -57,6 +62,43 @@
72
57
        }
62
        }
73
58
    }
63
    }
74
59
    \endqml
64
    \endqml
75
65
76
66
    \section1 Vertical Scrollbar and Flickable behaviour
77
67
78
68
    Since Flickable's topMargin and bottomMargin are modified by Ubuntu components
79
69
    such as \l BottomEdgeHint and \l Header in their positioning logic, the Scrollbar component
80
70
    uses the value of those properties to its top and bottom anchors margins, by default. This is
81
71
    to prevent any overlap with BottomEdgeHint or Header (see \l {Vertical Scrollbar and Header behaviour}
82
72
    for more info about that). In case you need to specify custom Flickable
83
73
    content margins (note: we're talking about content margins, not anchors ones), you will also have to
84
74
    override the top and bottom anchors margins of the Scrollbar accordingly.
85
75
86
76
    \section1 Vertical Scrollbar and Header behaviour
87
77
88
78
    The thumb of the Scrollbar should not move or resize unexpectedly. It would be confusing,
89
79
    for instance, if it moved under the user's finger (or pointer) while he's dragging it.
90
80
91
81
    Because the size and position of the thumb in a scrollbar is related to the size of the
92
82
    trough (or track) it slides in, it is important that the trough does not resize or move while the
93
83
    user is interacting with the component.
94
84
95
85
    In the context of a \l Page with a \l Header that slides in and out dynamically when the user
96
86
    flicks the surface (see \l {Header::flickable}), a vertical Scrollbar that is linked
97
87
    to the same flickable surface as the Header behaves as described below:
98
88
99
89
    \list
100
90
    \li - when the Header is exposed, the Scrollbar component sits right below it, \
101
91
          thus avoiding overlaps;
102
92
103
93
    \li - when the Header hides due to the user either flicking the surface or dragging \
104
94
          the thumb, the trough of the Scrollbar does not resize or move, thus avoiding \
105
95
          unexpected changes in thumb's position or size. As a side effect, the space \
106
96
          above the Scrollbar, previously occupied by Header, stays empty until the Header \
107
97
          is exposed again.
108
98
109
99
    \endlist
110
100
    \br
111
101
    This behaviour is intended and makes for a less confusing User Experience.
112
60
  */
102
  */
113
61
103
114
62
Toolkit.StyledItem {
104
Toolkit.StyledItem {
115
@@ -135,9 +177,9 @@
116
135
        right: internals.rightAnchor(__viewport ? __viewport : flickableItem)
177
        right: internals.rightAnchor(__viewport ? __viewport : flickableItem)
117
136
        rightMargin: internals.rightAnchorMargin()
178
        rightMargin: internals.rightAnchorMargin()
118
137
        top: internals.topAnchor(__viewport ? __viewport : flickableItem)
179
        top: internals.topAnchor(__viewport ? __viewport : flickableItem)
120
138
        topMargin: internals.topAnchorMargin()
180
        topMargin: (flickableItem ? flickableItem.topMargin : 0) + internals.topAnchorMargin()
121
139
        bottom: internals.bottomAnchor(__viewport ? __viewport : flickableItem)
181
        bottom: internals.bottomAnchor(__viewport ? __viewport : flickableItem)
123
140
        bottomMargin: internals.bottomAnchorMargin()
182
        bottomMargin: (flickableItem ? flickableItem.bottomMargin : 0) + internals.bottomAnchorMargin()
124
141
    }
183
    }
125
142
184
126
143
    /*!
185
    /*!
127
@@ -183,7 +225,6 @@
128
183
                        && __buddyScrollbar.align === Qt.AlignLeading
225
                        && __buddyScrollbar.align === Qt.AlignLeading
129
184
                        && __buddyScrollbar.__styleInstance.isScrollable)
226
                        && __buddyScrollbar.__styleInstance.isScrollable)
130
185
                    return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
227
                    return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
131
186
                    //return buddyScrollbar.__styleInstance.indicatorThickness
132
187
                // *ELSE FALLTHROUGH*
228
                // *ELSE FALLTHROUGH*
133
188
            default:
229
            default:
134
189
                return 0
230
                return 0
135
@@ -209,7 +250,6 @@
136
209
                        && __buddyScrollbar.align === Qt.AlignTrailing
250
                        && __buddyScrollbar.align === Qt.AlignTrailing
137
210
                        && __buddyScrollbar.__styleInstance.isScrollable)
251
                        && __buddyScrollbar.__styleInstance.isScrollable)
138
211
                    return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
252
                    return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
139
212
                    //return buddyScrollbar.__styleInstance.indicatorThickness
140
213
                // *ELSE FALLTHROUGH*
253
                // *ELSE FALLTHROUGH*
141
214
            default:
254
            default:
142
215
                return 0
255
                return 0
143
@@ -234,7 +274,6 @@
144
234
                        && __buddyScrollbar.align === Qt.AlignTop
274
                        && __buddyScrollbar.align === Qt.AlignTop
145
235
                        && __buddyScrollbar.__styleInstance.isScrollable)
275
                        && __buddyScrollbar.__styleInstance.isScrollable)
146
236
                    return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
276
                    return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
147
237
                    //return buddyScrollbar.__styleInstance.indicatorThickness
148
238
                // *ELSE FALLTHROUGH*
277
                // *ELSE FALLTHROUGH*
149
239
278
150
240
            default:
279
            default:
151
@@ -260,7 +299,6 @@
152
260
                        && __buddyScrollbar.align === Qt.AlignBottom
299
                        && __buddyScrollbar.align === Qt.AlignBottom
153
261
                        && __buddyScrollbar.__styleInstance.isScrollable)
300
                        && __buddyScrollbar.__styleInstance.isScrollable)
154
262
                    return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
301
                    return __buddyScrollbar.__styleInstance.troughThicknessSteppersStyle
155
263
                    //return buddyScrollbar.__styleInstance.indicatorThickness
156
264
                // *ELSE FALLTHROUGH*
302
                // *ELSE FALLTHROUGH*
157
265
            default:
303
            default:
158
266
                return 0
304
                return 0
159
267
305
160
=== modified file 'tests/unit_x11/tst_components/tst_scrollbar.qml'
161
--- tests/unit_x11/tst_components/tst_scrollbar.qml	2016-02-25 17:22:48 +0000
162
+++ tests/unit_x11/tst_components/tst_scrollbar.qml	2016-03-24 10:43:42 +0000
163
@@ -867,7 +867,32 @@
164
867
            flickableSanityCheck.rightMargin = -units.gu(3)
867
            flickableSanityCheck.rightMargin = -units.gu(3)
165
868
            flickableSanityCheck.bottomMargin = -units.gu(4)
868
            flickableSanityCheck.bottomMargin = -units.gu(4)
166
869
            performStyleSanityCheck(scrollbarSanityCheck)
869
            performStyleSanityCheck(scrollbarSanityCheck)
168
870
870
        }
169
871
170
872
        //Test that Scrollbar defaults to Flickable.topMargin/bottomMargin (content margins)
171
873
        //as its ANCHORS margins
172
874
        function test_topBottomMargins(data) {
173
875
            var freshTestItem = getFreshFlickable(data.alignment)
174
876
            var flickable = freshTestItem.flickable
175
877
            var scrollbar = freshTestItem.scrollbar
176
878
177
879
            compare(scrollbar.__styleInstance.isScrollable, true, "The view is not scrollable.")
178
880
            compare(scrollbar.__styleInstance.alwaysOnScrollbars, false, "This test assumes overlay scrollbars (if you need to change this, fix the expected margins).")
179
881
            compare(scrollbar.anchors.topMargin, flickable.topMargin, "Wrong anchors.topMargin.")
180
882
            compare(scrollbar.anchors.bottomMargin, flickable.bottomMargin, "Wrong anchors.bottomMargin.")
181
883
182
884
            flickable.topMargin = units.gu(1)
183
885
            compare(scrollbar.anchors.topMargin, units.gu(1), "Wrong anchors.topMargin.")
184
886
            compare(scrollbar.anchors.bottomMargin, flickable.bottomMargin, "Wrong anchors.bottomMargin.")
185
887
186
888
            flickable.bottomMargin = units.gu(3)
187
889
            compare(scrollbar.anchors.topMargin, units.gu(1), "Wrong anchors.topMargin.")
188
890
            compare(scrollbar.anchors.bottomMargin, units.gu(3), "Wrong anchors.bottomMargin.")
189
891
190
892
            flickable.topMargin = 0
191
893
            flickable.bottomMargin = units.gu(6)
192
894
            compare(scrollbar.anchors.topMargin, 0, "Wrong anchors.topMargin.")
193
895
            compare(scrollbar.anchors.bottomMargin, units.gu(6), "Wrong anchors.bottomMargin.")
194
871
        }
896
        }
195
872
    }
897
    }
196
873
}
898
}
197
874
899
198
=== added file 'tests/unit_x11/tst_components/tst_scrollbar_header.qml'
199
--- tests/unit_x11/tst_components/tst_scrollbar_header.qml	1970-01-01 00:00:00 +0000
200
+++ tests/unit_x11/tst_components/tst_scrollbar_header.qml	2016-03-24 10:43:42 +0000
201
@@ -0,0 +1,311 @@
202
1
/*
203
2
 * Copyright 2016 Canonical Ltd.
204
3
 *
205
4
 * This program is free software; you can redistribute it and/or modify
206
5
 * it under the terms of the GNU Lesser General Public License as published by
207
6
 * the Free Software Foundation; version 3.
208
7
 *
209
8
 * This program is distributed in the hope that it will be useful,
210
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
211
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
212
11
 * GNU Lesser General Public License for more details.
213
12
 *
214
13
 * You should have received a copy of the GNU Lesser General Public License
215
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
216
15
 *
217
16
 * Author: Andrea Bernabei <andrea.bernabei@canonical.com>
218
17
 */
219
18
220
19
import QtQuick 2.4
221
20
import QtTest 1.0
222
21
import Ubuntu.Test 1.0
223
22
import Ubuntu.Components 1.3
224
23
import Ubuntu.Components.Styles 1.3
225
24
import QtQml.Models 2.1
226
25
227
26
Item {
228
27
    id: main
229
28
    width: units.gu(50)
230
29
    height: units.gu(100)
231
30
232
31
    Component {
233
32
        id: flickableComp
234
33
        Item {
235
34
            id: item
236
35
            width: units.gu(20)
237
36
            height: units.gu(30)
238
37
            property alias flickable: freshFlickable
239
38
            property alias scrollbar: freshScrollbar
240
39
            property alias content: content
241
40
            property alias scrollbarAlignment: freshScrollbar.align
242
41
243
42
            //Don't change this to a ListView, this usecase has to be simple,
244
43
            //we don't want the difficulties added by ListView, i.e. delegates
245
44
            //size estimation, dynamic contentWidth/Height, etc
246
45
            Flickable {
247
46
                id: freshFlickable
248
47
                anchors.fill: parent
249
48
                contentHeight: content.height
250
49
                contentWidth: content.width
251
50
                clip: true
252
51
                Rectangle {
253
52
                    id: content
254
53
                    width: units.gu(40)
255
54
                    //make this much taller than the flickable to avoid timing issues when
256
55
                    //detecting if the flickable is flicking in the tests
257
56
                    height: units.gu(200)
258
57
                    color: "blue"
259
58
                }
260
59
            }
261
60
            Scrollbar {
262
61
                id: freshScrollbar
263
62
                flickableItem: parent.flickable
264
63
            }
265
64
        }
266
65
    }
267
66
268
67
    SignalSpy {
269
68
        id: signalSpy
270
69
    }
271
70
    SignalSpy {
272
71
        id: anotherSignalSpy
273
72
    }
274
73
275
74
    Flickable {
276
75
        anchors.fill: parent
277
76
        Column {
278
77
            id: column
279
78
            Repeater {
280
79
                model: layoutsModel
281
80
            }
282
81
        }
283
82
    }
284
83
285
84
    VisualItemModel {
286
85
        id: layoutsModel
287
86
        Item {
288
87
            width: childrenRect.width
289
88
            height: childrenRect.height
290
89
            Flickable {
291
90
                id: randomFlickable
292
91
            }
293
92
294
93
            //complex PageHeader example taken from the PageHeader tutorial
295
94
            //https://developer.ubuntu.com/en/blog/2016/02/24/pageheader-tutorial/
296
95
            MainView {
297
96
                id: mainView_movingHeaderTest
298
97
                width: units.gu(50)
299
98
                height: units.gu(80)
300
99
                clip: true
301
100
302
101
                property alias page: pageItem
303
102
                property alias standardHeader: standardHeaderItem
304
103
                property alias editHeader: editHeaderItem
305
104
306
105
                Page {
307
106
                    id: pageItem
308
107
                    header: standardHeaderItem
309
108
310
109
                    onHeaderChanged: console.log("NEW HEADER")
311
110
                    Flickable {
312
111
                        id: flickable_movingHeaderTest
313
112
                        anchors.fill: parent
314
113
                        //just make sure the scrollbar is scrollable
315
114
                        contentHeight: mainView_movingHeaderTest.height * 2
316
115
                        contentWidth: mainView_movingHeaderTest.width * 2
317
116
                        Label {
318
117
                            text: "Use the icons in the header."
319
118
                            visible: standardHeaderItem.visible
320
119
                        }
321
120
                    }
322
121
                    Scrollbar {
323
122
                        id: scrollbar_movingHeaderTest
324
123
                        flickableItem: flickable_movingHeaderTest
325
124
                    }
326
125
327
126
                    PageHeader {
328
127
                        id: standardHeaderItem
329
128
                        visible: pageItem.header === standardHeaderItem
330
129
                        title: "Default title"
331
130
                        flickable: flickable_movingHeaderTest
332
131
                        trailingActionBar.actions: [
333
132
                            Action {
334
133
                                iconName: "edit"
335
134
                                text: "Edit"
336
135
                                onTriggered: pageItem.header = editHeaderItem
337
136
                            }
338
137
                        ]
339
138
                    }
340
139
                    PageHeader {
341
140
                        id: editHeaderItem
342
141
                        visible: pageItem.header === editHeaderItem
343
142
                        flickable: flickable_movingHeaderTest
344
143
                        property Component delegate: Component {
345
144
                            AbstractButton {
346
145
                                id: button
347
146
                                action: modelData
348
147
                                width: label.width + units.gu(4)
349
148
                                height: parent.height
350
149
                                Rectangle {
351
150
                                    color: UbuntuColors.slate
352
151
                                    opacity: 0.1
353
152
                                    anchors.fill: parent
354
153
                                    visible: button.pressed
355
154
                                }
356
155
                                Label {
357
156
                                    anchors.centerIn: parent
358
157
                                    id: label
359
158
                                    text: action.text
360
159
                                    font.weight: text === "Confirm"
361
160
                                                 ? Font.Normal
362
161
                                                 : Font.Light
363
162
                                }
364
163
                            }
365
164
                        }
366
165
                        leadingActionBar {
367
166
                            anchors.leftMargin: 0
368
167
                            actions: Action {
369
168
                                text: "Cancel"
370
169
                                iconName: "close"
371
170
                                onTriggered: pageItem.header = standardHeaderItem
372
171
                            }
373
172
                            delegate: editHeaderItem.delegate
374
173
                        }
375
174
                        trailingActionBar {
376
175
                            anchors.rightMargin: 0
377
176
                            actions: Action {
378
177
                                text: "Confirm"
379
178
                                iconName: "tick"
380
179
                                onTriggered: pageItem.header = standardHeaderItem
381
180
                            }
382
181
                            delegate: editHeaderItem.delegate
383
182
                        }
384
183
                        extension: Toolbar {
385
184
                            anchors {
386
185
                                left: parent.left
387
186
                                right: parent.right
388
187
                                bottom: parent.bottom
389
188
                            }
390
189
                            trailingActionBar.actions: [
391
190
                                Action { iconName: "bookmark-new" },
392
191
                                Action { iconName: "add" },
393
192
                                Action { iconName: "edit-select-all" },
394
193
                                Action { iconName: "edit-copy" },
395
194
                                Action { iconName: "select" }
396
195
                            ]
397
196
                            leadingActionBar.actions: Action {
398
197
                                iconName: "delete"
399
198
                                text: "delete"
400
199
                                onTriggered: print("Delete action triggered")
401
200
                            }
402
201
                        }
403
202
                    }
404
203
405
204
                }
406
205
            }
407
206
408
207
        }
409
208
    }
410
209
411
210
    ScrollbarTestCase {
412
211
        name: "Scrollbar"
413
212
414
213
        function getMovingHeaderView() {
415
214
            var wrapper = movingHeaderHandlingItem.createObject(column)
416
215
            verify(wrapper !== null, "Error: dynamic item creation failed.")
417
216
            currComponent = wrapper
418
217
            return currComponent
419
218
        }
420
219
421
220
        function cleanup() {
422
221
            if (currComponent) {
423
222
                currComponent.destroy()
424
223
                currComponent = null
425
224
            }
426
225
            gc()
427
226
        }
428
227
429
228
        function checkScrollbarPositionRelativeToPage(scrollbar, page, expectedY, msgPrefix) {
430
229
            compare(scrollbar.mapToItem(page).y, expectedY, msgPrefix + ": Scrollbar does not start below the header.")
431
230
        }
432
231
433
232
        function test_handlingOfMovingHeader_data() {
434
233
            return [
435
234
                        { tag: "Standard header", header: standardHeaderItem },
436
235
                        { tag: "Edit header (with extensions)", header: editHeaderItem },
437
236
                        //Setting header to null means using the old header, and:
438
237
                        //- We don't support this behaviour when using the old header
439
238
                        //- There is no API to get the height of the old header, so we can't test it
440
239
                        //{ tag: "Null header", header: null }
441
240
                    ]
442
241
        }
443
242
        function test_handlingOfMovingHeader(data) {
444
243
            var page = pageItem
445
244
            var header = data.header
446
245
447
246
            page.header = header
448
247
            console.log(page.header, header.flickable)
449
248
450
249
            //make sure the currently tested header is the one driving the flickable changes
451
250
            //FIXME: this should not be needed after #1560458 is fixed
452
251
            header.flickable = null
453
252
            header.flickable = flickable_movingHeaderTest
454
253
455
254
            compare(page.header, header, "Handling of moving header: wrong header.")
456
255
            compare(scrollbar_movingHeaderTest.__styleInstance.isVertical, true, "Scrollbar is not vertical.")
457
256
            compare(scrollbar_movingHeaderTest.__styleInstance.isScrollable, true, "Scrollbar is not scrollable.")
458
257
459
258
            //don't do the rest of the checks on the null header, just check that it's aligning with the old header implementation
460
259
            //(page.head.contents.height)
461
260
            if (data.header === null) {
462
261
                checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.head.contents.height, data.tag)
463
262
                return
464
263
            } else {
465
264
                header.flickable = flickable_movingHeaderTest
466
265
                compare(header.flickable, flickable_movingHeaderTest, "Wrong PageHeader flickable.")
467
266
                checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.header.height, data.tag)
468
267
            }
469
268
470
269
            var tmpHeaderHeight = header.height
471
270
            page.header.height += units.gu(1)
472
271
            //make sure the header actually has a different height now
473
272
            verify(scrollbar_movingHeaderTest.height !== tmpHeaderHeight, "Header height changed value.")
474
273
            checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.header.height,
475
274
                                                 data.tag + ", after changing height")
476
275
477
276
            //now link the header to a null flickable and check that scrollbar is covered
478
277
            //the header (yes, we're checking that it creates bad UX, because we're expecting the
479
278
            //developer to set the anchors accordingly so that we don't need to add  inter-components
480
279
            //dependencies. The test Page does not handle this on purpose, so the header
481
280
            //should cover the scrollbar)
482
281
            header.flickable = null
483
282
            compare(header.flickable, null, "Wrong PageHeader flickable.")
484
283
            expectFailContinue("Standard header", "Waiting on Header bug #1560458")
485
284
            checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, 0, data.tag)
486
285
487
286
            //reassign the correct flickable and check again
488
287
            header.flickable = flickable_movingHeaderTest
489
288
            compare(header.flickable, flickable_movingHeaderTest, "Wrong PageHeader flickable.")
490
289
            checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.header.height, data.tag + ", scrollbar")
491
290
492
291
            header.visible = false
493
292
            compare(header.visible, false, "Header visibility did not change, should have been false.")
494
293
            expectFailContinue("", "Waiting on Header bug #1560458")
495
294
            checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, 0, data.tag + ", invisible header")
496
295
497
296
            header.visible = true
498
297
            compare(header.visible, true, "Header visibility did not change, should have been true.")
499
298
            checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.header.height, data.tag + ", visible header")
500
299
501
300
            //even if the header has opacity 0, we should still take it into account. This is a standard in
502
301
            //QtQuick, you don't ignore a component just because opacity is 0, as that is also used for animations
503
302
            header.opacity = 0.0
504
303
            compare(header.opacity, 0.0, "Header opacity did not change, should have been 0.")
505
304
            checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.header.height, data.tag + ", 0.0 header opacity")
506
305
507
306
            header.opacity = 1.0
508
307
            compare(header.opacity, 1.0, "Header opacity did not change, should have been 1.")
509
308
            checkScrollbarPositionRelativeToPage(scrollbar_movingHeaderTest, page, page.header.height, data.tag + ", 1.0 header opacity")
510
309
        }
511
310
    }
512
311
}
Status:	Merged
Approved by:	Zoltan Balogh on 2016-03-25
Approved revision:	1907
Merged at revision:	1910
Proposed branch:	lp:~faenil/ubuntu-ui-toolkit/scrollbar_defaultTopBottomMargins
Merge into:	lp:ubuntu-ui-toolkit/staging
Diff against target:	512 lines (+393/-15) 5 files modified examples/ubuntu-ui-toolkit-gallery/Template.qml (+1/-4) src/Ubuntu/Components/1.3/ScrollView.qml (+7/-0) src/Ubuntu/Components/1.3/Scrollbar.qml (+48/-10) tests/unit_x11/tst_components/tst_scrollbar.qml (+26/-1) tests/unit_x11/tst_components/tst_scrollbar_header.qml (+311/-0)
To merge this branch:	bzr merge lp:~faenil/ubuntu-ui-toolkit/scrollbar_defaultTopBottomMargins
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-03-25
Zsombor Egri		2016-03-23	Approve on 2016-03-24
Review via email: mp+289946@code.launchpad.net