1
=== modified file 'src/UbuntuToolkit/ucslotslayout.cpp'
2
--- src/UbuntuToolkit/ucslotslayout.cpp	2016-09-09 17:49:07 +0000
3
+++ src/UbuntuToolkit/ucslotslayout.cpp	2016-09-27 21:51:14 +0000
4
@@ -51,8 +51,10 @@
5
51
51
6
52
    QObject::connect(&padding, SIGNAL(leadingChanged()), q, SLOT(_q_relayout()));
52
    QObject::connect(&padding, SIGNAL(leadingChanged()), q, SLOT(_q_relayout()));
7
53
    QObject::connect(&padding, SIGNAL(trailingChanged()), q, SLOT(_q_relayout()));
53
    QObject::connect(&padding, SIGNAL(trailingChanged()), q, SLOT(_q_relayout()));
10
54
    QObject::connect(&padding, SIGNAL(topChanged()), q, SLOT(_q_relayout()));
54
11
55
    QObject::connect(&padding, SIGNAL(bottomChanged()), q, SLOT(_q_relayout()));
55
    //we're assuming _q_updateSize will call _q_relayout()
12
56
    QObject::connect(&padding, SIGNAL(topChanged()), q, SLOT(_q_updateSize()));
13
57
    QObject::connect(&padding, SIGNAL(bottomChanged()), q, SLOT(_q_updateSize()));
14
56
58
15
57
    QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(_q_onGuValueChanged()));
59
    QObject::connect(UCUnits::instance(), SIGNAL(gridUnitChanged()), q, SLOT(_q_onGuValueChanged()));
16
58
60
17
59
61
18
=== modified file 'tests/unit/visual/tst_slotslayout.13.qml'
19
--- tests/unit/visual/tst_slotslayout.13.qml	2016-06-15 13:46:51 +0000
20
+++ tests/unit/visual/tst_slotslayout.13.qml	2016-09-27 21:51:14 +0000
21
@@ -158,6 +158,22 @@
22
158
            Item { id: layoutCustomPadding_trailing2; SlotsLayout.position: SlotsLayout.Trailing; width: units.gu(3); height: units.gu(9) }
158
            Item { id: layoutCustomPadding_trailing2; SlotsLayout.position: SlotsLayout.Trailing; width: units.gu(3); height: units.gu(9) }
23
159
        }
159
        }
24
160
        ListItemLayout {
160
        ListItemLayout {
25
161
            id: layoutCustomPaddingSet
26
162
            title.text: "Test"
27
163
        }
28
164
        ListItemLayout {
29
165
            id: layoutCustomPaddingChanges
30
166
            readonly property var leadingSlots: []
31
167
            readonly property var trailingSlots: []
32
168
            padding {
33
169
                top: units.gu(2)
34
170
                bottom: units.gu(2)
35
171
                leading: units.gu(2)
36
172
                trailing: units.gu(2)
37
173
            }
38
174
            title.text: "Padded"
39
175
        }
40
176
        ListItemLayout {
41
161
            id: layoutTestChangeSlotsSize
177
            id: layoutTestChangeSlotsSize
42
162
            readonly property var leadingSlots: [layoutTestChangeSlotsSize_leading1]
178
            readonly property var leadingSlots: [layoutTestChangeSlotsSize_leading1]
43
163
            readonly property var trailingSlots: []
179
            readonly property var trailingSlots: []
44
@@ -507,6 +523,41 @@
45
507
            checkSlotsPosition(data.item)
523
            checkSlotsPosition(data.item)
46
508
        }
524
        }
47
509
525
48
526
        function test_customPaddingSet_data(){
49
527
            return [
50
528
                        { tag: "Custom padding top", item: layoutCustomPaddingSet, position: "top" },
51
529
                        { tag: "Custom padding bottom", item: layoutCustomPaddingSet, position: "bottom" },
52
530
                        { tag: "Custom padding leading", item: layoutCustomPaddingSet, position: "leading" },
53
531
                        { tag: "Custom padding trailing", item: layoutCustomPaddingSet, position: "trailing" },
54
532
                    ]
55
533
        }
56
534
57
535
        function test_customPaddingSet(data) {
58
536
            var oldValue = data.item.padding[data.position]
59
537
            var newValue = oldValue + units.gu(5)
60
538
            data.item.padding[data.position] = newValue
61
539
            compare(data.item.padding[data.position], newValue, "Changing "+data.position+"padding failed")
62
540
        }
63
541
64
542
        function test_customPaddingUpdatesHeight_data(){
65
543
            return [
66
544
                        { tag: "Custom padding Smaller", item: layoutCustomPaddingChanges, padding: units.gu(1) },
67
545
                        { tag: "Custom padding Bigger", item: layoutCustomPaddingChanges, padding: units.gu(3) },
68
546
                    ]
69
547
        }
70
548
71
549
        function test_customPaddingUpdatesHeight(data) {
72
550
            var initialHeight = data.item.height
73
551
            data.item.padding.top = data.padding
74
552
            compare(data.item.height, expectedImplicitHeight(data.item), "Changing top padding doesn't update height")
75
553
            verify(data.item.height !== initialHeight)
76
554
77
555
            initialHeight = data.item.height
78
556
            data.item.padding.bottom = data.padding
79
557
            compare(data.item.height, expectedImplicitHeight(data.item), "Changing bottom padding doesn't update height")
80
558
            verify(data.item.height !== initialHeight)
81
559
        }
82
560
83
510
        function test_relayoutAfterChangingSlotsSize() {
561
        function test_relayoutAfterChangingSlotsSize() {
84
511
            checkSlotsPosition(layoutTestChangeSlotsSize)
562
            checkSlotsPosition(layoutTestChangeSlotsSize)
85
512
563
Reviewer	Review Type	Date Requested	Status
ubuntu-sdk-build-bot	continuous-integration		Approve on 2016-09-28
Andrea Bernabei (community)		2016-09-27	Approve on 2016-09-27
Review via email: mp+306907@code.launchpad.net