Ubuntu Pastebin

Paste from cimi at Thu, 17 Nov 2016 10:27:56 +0000

Download as text
 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml	2016-11-09 15:04:57 +0000
+++ qml/Dash/GenericScopeView.qml	2016-11-17 10:24:25 +0000
@@ -245,7 +245,10 @@
 
             readonly property bool expandable: {
                 if (categoryView.model.count === 1) return false;
-                if (cardTool.template && cardTool.template["collapsed-rows"] === 0) return false;
+                if (cardTool.template) {
+                    if (cardTool.template["expandable"] === false) return false;
+                    if (cardTool.template["collapsed-rows"] === 0) return false;
+                }
                 if (item && item.expandedHeight > item.collapsedHeight) return true;
                 return false;
             }

=== modified file 'tests/mocks/Unity/fake_categories.cpp'
--- tests/mocks/Unity/fake_categories.cpp	2016-03-07 17:12:34 +0000
+++ tests/mocks/Unity/fake_categories.cpp	2016-11-17 10:26:19 +0000
@@ -66,6 +66,7 @@
             QVariantMap map;
             if (index.row() % 2 == 0) {
                 map["category-layout"] = "grid";
+                map["expandable"] = false;
             } else {
                 map["category-layout"] = "carousel";
             }
Download as text