git.iko.soy/unity8
on xenial help sign in
As albert recommends
commit709ca5d81b00c4071ded4decccb19783e8f85bd6 authorAndrea Cimitan <andrea.cimitan@gmail.com> dateFri 20 Nov 2015, 15:36 (11 years ago) parenta656a6e
3 files changed+2−4
compare with xenial
unifiedsplit
qml/Components/ResponsiveGridView.qml−1 qml/Dash/CardGrid.qml+1−3 qml/Dash/GenericScopeView.qml+1
qml/Components/ResponsiveGridView.qml−1
@@ -50,7 +50,6 @@ Item {
5050 property alias highlightIndex: gridView.highlightIndex
5151 property alias cacheBuffer: gridView.cacheBuffer
5252 readonly property alias currentItem: gridView.currentItem
53− property alias topMargin: gridView.topMargin
5453
5554 function contentHeightForRows(rows, height) {
5655 return rows * height
qml/Dash/CardGrid.qml+1−3
@@ -24,8 +24,7 @@ DashRenderer {
2424 if (!cardTool || !cardTool.template || typeof cardTool.template["collapsed-rows"] != "number") return 2;
2525 return cardTool.template["collapsed-rows"];
2626 }
27− // hackish, relies on GenericScopeView.qml:335 tweak to detect application icons in click scope
28− readonly property var artShapeStyle: cardTool.artShapeSize === Qt.size(units.gu(8), units.gu(7.5)) ? "icon" : "inset";
27+ property string artShapeStyle: "inset";
2928
3029 expandedHeight: grid.totalContentHeight
3130 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
@@ -54,7 +53,6 @@ DashRenderer {
5453 displayMarginEnd: root.displayMarginEnd
5554 cacheBuffer: root.cacheBuffer
5655 interactive: false
57− topMargin: root.artShapeStyle === "icon" ? units.gu(0.1) : 0 // otherwise when we have a shadow, its top is clipped
5856 delegate: Item {
5957 width: grid.cellWidth
6058 height: grid.cellHeight
qml/Dash/GenericScopeView.qml+1
@@ -370,6 +370,7 @@ FocusScope {
370370 }
371371 }
372372 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));
373+ item.artShapeStyle = "icon";
373374 }
374375 item.cardTool = cardTool;
375376 }