1
=== modified file 'qml/Dash/GenericScopeView.qml'
2
--- qml/Dash/GenericScopeView.qml	2016-05-27 13:52:20 +0000
3
+++ qml/Dash/GenericScopeView.qml	2016-06-07 13:49:49 +0000
4
@@ -342,8 +342,8 @@
5
342
                    }
342
                    }
6
343
                    updateRanges();
343
                    updateRanges();
7
344
                    clickScopeSizingHacks();
344
                    clickScopeSizingHacks();
10
345
                    if (scope && scope.id === "clickscope") {
345
                    if (scope && (scope.id === "clickscope" || scope.id === "libertine-scope.ubuntu_libertine-scope")) {
11
346
                        if (categoryId === "predefined" || categoryId === "local") {
346
                        if (scope.id === "libertine-scope.ubuntu_libertine-scope" || categoryId === "predefined" || categoryId === "local") {
12
347
                            cardTool.artShapeSize = Qt.binding(function() { return Qt.size(units.gu(8), units.gu(7.5)) });
347
                            cardTool.artShapeSize = Qt.binding(function() { return Qt.size(units.gu(8), units.gu(7.5)) });
13
348
                            cardTool.artShapeStyle = "icon";
348
                            cardTool.artShapeStyle = "icon";
14
349
                        } else {
349
                        } else {
15
@@ -367,8 +367,9 @@
16
367
                onPxpguChanged: clickScopeSizingHacks();
367
                onPxpguChanged: clickScopeSizingHacks();
17
368
368
18
369
                function clickScopeSizingHacks() {
369
                function clickScopeSizingHacks() {
21
370
                    if (scope && scope.id === "clickscope" &&
370
                    if (scope &&
22
371
                        (categoryId === "predefined" || categoryId === "local")) {
371
                        ((scope.id === "clickscope" && (categoryId === "predefined" || categoryId === "local")) ||
23
372
                         scope.id === "libertine-scope.ubuntu_libertine-scope")) {
24
372
                        // Yeah, hackish :/
373
                        // Yeah, hackish :/
25
373
                        if (scopeView.width > units.gu(45)) {
374
                        if (scopeView.width > units.gu(45)) {
26
374
                            if (scopeView.width >= units.gu(70)) {
375
                            if (scopeView.width >= units.gu(70)) {
27
375
376
28
=== modified file 'tests/mocks/Unity/fake_scopes.cpp'
29
--- tests/mocks/Unity/fake_scopes.cpp	2016-04-29 14:57:44 +0000
30
+++ tests/mocks/Unity/fake_scopes.cpp	2016-06-07 13:49:49 +0000
31
@@ -60,6 +60,7 @@
32
60
    addScope(new Scope("MockScope7", "MS7", false, this));
60
    addScope(new Scope("MockScope7", "MS7", false, this));
33
61
    addScope(new Scope("MockScope8", "MS8", false, this));
61
    addScope(new Scope("MockScope8", "MS8", false, this));
34
62
    addScope(new Scope("MockScope9", "MS9", false, this));
62
    addScope(new Scope("MockScope9", "MS9", false, this));
35
63
    addScope(new Scope("libertine-scope.ubuntu_libertine-scope", "Libertine", true, this));
36
63
64
37
64
    Scope *longNavigationScope = new Scope(
65
    Scope *longNavigationScope = new Scope(
38
65
            "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,
66
            "LongPrimaryNavigation", "LongPrimaryNavigation", true, this, 1, false,
39
66
67
40
=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
41
--- tests/qmltests/Dash/tst_Dash.qml	2016-06-07 13:49:49 +0000
42
+++ tests/qmltests/Dash/tst_Dash.qml	2016-06-07 13:49:49 +0000
43
@@ -58,7 +58,7 @@
44
58
            tryCompare(dashContentList, "count", 0);
58
            tryCompare(dashContentList, "count", 0);
45
59
            scopes.load();
59
            scopes.load();
46
60
            tryCompare(dashContentList, "currentIndex", 0);
60
            tryCompare(dashContentList, "currentIndex", 0);
48
61
            tryCompare(dashContentList, "count", 7);
61
            tryCompare(dashContentList, "count", 8);
49
62
            tryCompare(scopes, "loaded", true);
62
            tryCompare(scopes, "loaded", true);
50
63
            tryCompareFunction(function() {
63
            tryCompareFunction(function() {
51
64
                var mockScope1Loader = findChild(dash, "scopeLoader0");
64
                var mockScope1Loader = findChild(dash, "scopeLoader0");
52
@@ -652,6 +652,15 @@
53
652
            var tile = getCategoryDelegate("predefined", 2);
652
            var tile = getCategoryDelegate("predefined", 2);
54
653
            var proportionalShape = findChildsByType(tile, "UCProportionalShape");
653
            var proportionalShape = findChildsByType(tile, "UCProportionalShape");
55
654
            compare(proportionalShape.length, 1);
654
            compare(proportionalShape.length, 1);
56
655
57
656
            dash.setCurrentScope("libertine-scope.ubuntu_libertine-scope");
58
657
            var dashContent = findChild(dash, "dashContent");
59
658
            tryCompare(dashContent.currentScope, "id", "libertine-scope.ubuntu_libertine-scope");
60
659
61
660
            scrollToCategory("dashCategory2");
62
661
            tile = getCategoryDelegate("2", 2);
63
662
            proportionalShape = findChildsByType(tile, "UCProportionalShape");
64
663
            compare(proportionalShape.length, 1);
65
655
        }
664
        }
66
656
665
67
657
        function test_tempScopeItemXOnResize()
666
        function test_tempScopeItemXOnResize()
68
658
667
69
=== modified file 'tests/qmltests/Dash/tst_DashContent.qml'
70
--- tests/qmltests/Dash/tst_DashContent.qml	2016-05-27 13:52:20 +0000
71
+++ tests/qmltests/Dash/tst_DashContent.qml	2016-06-07 13:49:49 +0000
72
@@ -124,7 +124,7 @@
73
124
124
74
125
            loadScopes();
125
            loadScopes();
75
126
126
77
127
            compare(dashContentList.count, 7);
127
            compare(dashContentList.count, 8);
78
128
            verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
128
            verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < dashContentList.count);
79
129
        }
129
        }
80
130
130
81
131
131
82
=== modified file 'tests/qmltests/Dash/tst_DashShell.qml'
83
--- tests/qmltests/Dash/tst_DashShell.qml	2016-05-03 22:39:09 +0000
84
+++ tests/qmltests/Dash/tst_DashShell.qml	2016-06-07 13:49:49 +0000
85
@@ -60,7 +60,7 @@
86
60
            tryCompare(dashContentList, "count", 0);
60
            tryCompare(dashContentList, "count", 0);
87
61
            scopes.load();
61
            scopes.load();
88
62
            tryCompare(dashContentList, "currentIndex", 0);
62
            tryCompare(dashContentList, "currentIndex", 0);
90
63
            tryCompare(dashContentList, "count", 7);
63
            tryCompare(dashContentList, "count", 8);
91
64
            tryCompare(scopes, "loaded", true);
64
            tryCompare(scopes, "loaded", true);
92
65
            tryCompareFunction(function() {
65
            tryCompareFunction(function() {
93
66
                var mockScope1Loader = findChild(dash, "scopeLoader0");
66
                var mockScope1Loader = findChild(dash, "scopeLoader0");
Status:	Merged
Approved by:	Albert Astals Cid on 2016-06-07
Approved revision:	2445
Merged at revision:	2475
Proposed branch:	lp:~cimi/unity8/tweaks-libertine-scope
Merge into:	lp:unity8
Prerequisite:	lp:~cimi/unity8/cardCreatorCache_update-on-artShapeStyle
Diff against target:	93 lines (+18/-7) 5 files modified qml/Dash/GenericScopeView.qml (+5/-4) tests/mocks/Unity/fake_scopes.cpp (+1/-0) tests/qmltests/Dash/tst_Dash.qml (+10/-1) tests/qmltests/Dash/tst_DashContent.qml (+1/-1) tests/qmltests/Dash/tst_DashShell.qml (+1/-1)
To merge this branch:	bzr merge lp:~cimi/unity8/tweaks-libertine-scope
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-06-08
Albert Astals Cid (community)		2016-06-07	Approve on 2016-06-07
Review via email: mp+296658@code.launchpad.net