709ca5d · unity8 · git.iko.soy

qml/Components/ResponsiveGridView.qml−1

compare with xenial

unifiedsplit

@@ -50,7 +50,6 @@ Item {

50 property alias highlightIndex: gridView.highlightIndex

51 property alias cacheBuffer: gridView.cacheBuffer

52 readonly property alias currentItem: gridView.currentItem

53− property alias topMargin: gridView.topMargin

54

53

55 function contentHeightForRows(rows, height) {

54 function contentHeightForRows(rows, height) {

56 return rows * height

55 return rows * height

qml/Dash/CardGrid.qml+1−3

@@ -24,8 +24,7 @@ DashRenderer {

24 if (!cardTool || !cardTool.template || typeof cardTool.template["collapsed-rows"] != "number") return 2;

25 return cardTool.template["collapsed-rows"];

26 }

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";

29

28

30 expandedHeight: grid.totalContentHeight

29 expandedHeight: grid.totalContentHeight

31 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)

30 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)

@@ -54,7 +53,6 @@ DashRenderer {

54 displayMarginEnd: root.displayMarginEnd

53 displayMarginEnd: root.displayMarginEnd

55 cacheBuffer: root.cacheBuffer

54 cacheBuffer: root.cacheBuffer

56 interactive: false

55 interactive: false

57− topMargin: root.artShapeStyle === "icon" ? units.gu(0.1) : 0 // otherwise when we have a shadow, its top is clipped

58 delegate: Item {

56 delegate: Item {

59 width: grid.cellWidth

57 width: grid.cellWidth

60 height: grid.cellHeight

58 height: grid.cellHeight

qml/Dash/GenericScopeView.qml+1

@@ -370,6 +370,7 @@ FocusScope {

370 }

371 }

372 cardTool.artShapeSize = Qt.size(units.gu(8), units.gu(7.5));

373+ item.artShapeStyle = "icon";

373 }

374 }

374 item.cardTool = cardTool;

375 item.cardTool = cardTool;

375 }

376 }