1
=== modified file 'qml/Dash/CardGrid.qml'
2
--- qml/Dash/CardGrid.qml	2016-01-28 10:49:58 +0000
3
+++ qml/Dash/CardGrid.qml	2016-01-28 10:49:59 +0000
4
@@ -20,6 +20,7 @@
5
20
DashRenderer {
20
DashRenderer {
6
21
    id: root
21
    id: root
7
22
22
8
23
    readonly property real defaultMinimumHorizontalSpacing: units.gu(1)
9
23
    readonly property int collapsedRows: {
24
    readonly property int collapsedRows: {
10
24
        if (!cardTool || !cardTool.template || typeof cardTool.template["collapsed-rows"] != "number") return 2;
25
        if (!cardTool || !cardTool.template || typeof cardTool.template["collapsed-rows"] != "number") return 2;
11
25
        return cardTool.template["collapsed-rows"];
26
        return cardTool.template["collapsed-rows"];
12
@@ -46,7 +47,7 @@
13
46
    ResponsiveGridView {
47
    ResponsiveGridView {
14
47
        id: grid
48
        id: grid
15
48
        anchors.fill: parent
49
        anchors.fill: parent
17
49
        minimumHorizontalSpacing: units.gu(1)
50
        minimumHorizontalSpacing: root.defaultMinimumHorizontalSpacing
18
50
        delegateWidth: cardTool.cardWidth
51
        delegateWidth: cardTool.cardWidth
19
51
        delegateHeight: cardTool.cardHeight
52
        delegateHeight: cardTool.cardHeight
20
52
        verticalSpacing: units.gu(1)
53
        verticalSpacing: units.gu(1)
21
53
54
22
=== modified file 'qml/Dash/GenericScopeView.qml'
23
--- qml/Dash/GenericScopeView.qml	2016-01-28 10:49:58 +0000
24
+++ qml/Dash/GenericScopeView.qml	2016-01-28 10:49:59 +0000
25
@@ -360,17 +360,9 @@
26
360
                        baseItem.expand(shouldExpand, false /*animate*/);
360
                        baseItem.expand(shouldExpand, false /*animate*/);
27
361
                    }
361
                    }
28
362
                    updateRanges();
362
                    updateRanges();
29
363
                    clickScopeSizingHacks();
30
363
                    if (scope && scope.id === "clickscope") {
364
                    if (scope && scope.id === "clickscope") {
31
364
                        if (categoryId === "predefined" || categoryId === "local") {
365
                        if (categoryId === "predefined" || categoryId === "local") {
32
365
                            // Yeah, hackish :/
33
366
                            if (scopeView.width > units.gu(45)) {
34
367
                                if (scopeView.width >= units.gu(70)) {
35
368
                                    cardTool.cardWidth = units.gu(11);
36
369
                                    item.minimumHorizontalSpacing = units.gu(5)
37
370
                                } else {
38
371
                                    cardTool.cardWidth = units.gu(10);
39
372
                                }
40
373
                            }
41
374
                            cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
366
                            cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
42
375
                            item.artShapeStyle = "icon";
367
                            item.artShapeStyle = "icon";
43
376
                        } else {
368
                        } else {
44
@@ -388,6 +380,23 @@
45
388
                    }
380
                    }
46
389
                }
381
                }
47
390
382
48
383
                function clickScopeSizingHacks() {
49
384
                    if (scope && scope.id === "clickscope" &&
50
385
                        (categoryId === "predefined" || categoryId === "local")) {
51
386
                        // Yeah, hackish :/
52
387
                        if (scopeView.width > units.gu(45)) {
53
388
                            if (scopeView.width >= units.gu(70)) {
54
389
                                cardTool.cardWidth = units.gu(11);
55
390
                                item.minimumHorizontalSpacing = units.gu(5);
56
391
                                return;
57
392
                            } else {
58
393
                                cardTool.cardWidth = units.gu(10);
59
394
                            }
60
395
                        }
61
396
                        item.minimumHorizontalSpacing = item.defaultMinimumHorizontalSpacing;
62
397
                    }
63
398
                }
64
399
65
391
                Connections {
400
                Connections {
66
392
                    target: rendererLoader.item
401
                    target: rendererLoader.item
67
393
                    onClicked: { // (int index, var result, var item, var itemModel)
402
                    onClicked: { // (int index, var result, var item, var itemModel)
68
@@ -417,6 +426,7 @@
69
417
                    target: scopeView
426
                    target: scopeView
70
418
                    onIsCurrentChanged: rendererLoader.updateRanges();
427
                    onIsCurrentChanged: rendererLoader.updateRanges();
71
419
                    onVisibleToParentChanged: rendererLoader.updateRanges();
428
                    onVisibleToParentChanged: rendererLoader.updateRanges();
72
429
                    onWidthChanged: rendererLoader.clickScopeSizingHacks();
73
420
                }
430
                }
74
421
                Connections {
431
                Connections {
75
422
                    target: holdingList
432
                    target: holdingList
76
423
433
77
=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
78
--- tests/qmltests/Dash/tst_GenericScopeView.qml	2016-01-28 10:49:58 +0000
79
+++ tests/qmltests/Dash/tst_GenericScopeView.qml	2016-01-28 10:49:59 +0000
80
@@ -666,6 +666,26 @@
81
666
                var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
666
                var shape = findChildsByType(artShapeLoader, "UCUbuntuShape");
82
667
                compare(shape.borderSource, undefined);
667
                compare(shape.borderSource, undefined);
83
668
            }
668
            }
84
669
85
670
            function test_clickScopeSizing() {
86
671
                genericScopeView.scope = scopes.getScopeFromAll("clickscope");
87
672
                waitForRendering(genericScopeView);
88
673
89
674
                var categoryListView = findChild(genericScopeView, "categoryListView");
90
675
                waitForRendering(categoryListView);
91
676
92
677
                var categorypredefined = findChild(categoryListView, "dashCategorypredefined");
93
678
                waitForRendering(categorypredefined);
94
679
95
680
                var cardTool = findChild(categorypredefined, "cardTool");
96
681
97
682
                compare(cardTool.cardWidth, units.gu(11));
98
683
                shell.width = units.gu(46);
99
684
                waitForRendering(genericScopeView);
100
685
                compare(cardTool.cardWidth, units.gu(10));
101
686
102
687
                shell.width = units.gu(120)
103
688
            }
104
669
        }
689
        }
105
670
    }
690
    }
106
671
}
691
}
Reviewer	Review Type	Date Requested	Status
Albert Astals Cid (community)	code looks good	2016-01-22	Approve on 2016-01-29
PS Jenkins bot (community)	continuous-integration	2016-01-22	Needs Fixing on 2016-01-28
Unity8 CI Bot	continuous-integration	2016-01-22	Approve on 2016-01-28
Review via email: mp+283674@code.launchpad.net