Ubuntu Pastebin

Paste from Albert Astals Cid at Fri, 20 Nov 2015 12:20:02 +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
=== modified file 'qml/Dash/CardGrid.qml'
--- qml/Dash/CardGrid.qml       2015-11-19 16:55:31 +0000
+++ qml/Dash/CardGrid.qml       2015-11-20 12:19:41 +0000
@@ -24,8 +24,7 @@
         if (!cardTool || !cardTool.template || typeof cardTool.template["collapsed-rows"] != "number") return 2;
         return cardTool.template["collapsed-rows"];
     }
-    // hackish, relies on GenericScopeView.qml:335 tweak to detect application icons in click scope
-    readonly property var artShapeStyle: cardTool.artShapeSize === Qt.size(units.gu(8), units.gu(7.5)) ? "icon" : "inset";
+    property string artShapeStyle: "inset";
 
     expandedHeight: grid.totalContentHeight
     collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)

=== modified file 'qml/Dash/GenericScopeView.qml'
--- qml/Dash/GenericScopeView.qml       2015-10-26 08:53:52 +0000
+++ qml/Dash/GenericScopeView.qml       2015-11-20 12:14:11 +0000
@@ -370,6 +370,7 @@
                             }
                         }
                         cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
+                        item.artShapeStyle = "icon";
                     }
                     item.cardTool = cardTool;
                 }
Download as text