git.iko.soy/unity8
on xenial help sign in
Pass down the variables to the function
033eafaAlbert Astals
qml/Components/FilterGrid.qml+2−2
compare with xenial
unifiedsplit
@@ -39,8 +39,8 @@ Item {
39 property int uncollapsedRowCount: Math.ceil(model.count / columns)
39 property int uncollapsedRowCount: Math.ceil(model.count / columns)
40 /* Never show more rows than model would fill up. */
40 /* Never show more rows than model would fill up. */
41 readonly property int rowsWhenCollapsed: Math.min(collapsedRowCount, uncollapsedRowCount)
41 readonly property int rowsWhenCollapsed: Math.min(collapsedRowCount, uncollapsedRowCount)
42− readonly property int collapsedHeight: iconTileGrid.contentHeightForRows(rowsWhenCollapsed)
42+ readonly property int collapsedHeight: iconTileGrid.contentHeightForRows(rowsWhenCollapsed, cellHeight, verticalSpacing)
43− readonly property int uncollapsedHeight: iconTileGrid.contentHeightForRows(uncollapsedRowCount)
43+ readonly property alias uncollapsedHeight: iconTileGrid.totalContentHeight
44
44
45 property alias minimumHorizontalSpacing: iconTileGrid.minimumHorizontalSpacing
45 property alias minimumHorizontalSpacing: iconTileGrid.minimumHorizontalSpacing
46 property alias maximumNumberOfColumns: iconTileGrid.maximumNumberOfColumns
46 property alias maximumNumberOfColumns: iconTileGrid.maximumNumberOfColumns
qml/Components/ResponsiveGridView.qml+3−3
@@ -34,7 +34,7 @@ Item {
34 readonly property int cellWidth: gridView.cellWidth
34 readonly property int cellWidth: gridView.cellWidth
35 readonly property int cellHeight: gridView.cellHeight
35 readonly property int cellHeight: gridView.cellHeight
36 readonly property int totalContentHeight: {
36 readonly property int totalContentHeight: {
37− return contentHeightForRows(Math.ceil(gridView.model.count / columns))
37+ return contentHeightForRows(Math.ceil(gridView.model.count / columns), cellHeight, verticalSpacing)
38 }
38 }
39 property alias interactive: gridView.interactive
39 property alias interactive: gridView.interactive
40 readonly property alias flicking: gridView.flicking
40 readonly property alias flicking: gridView.flicking
@@ -46,8 +46,8 @@ Item {
46 property alias highlightIndex: gridView.highlightIndex
46 property alias highlightIndex: gridView.highlightIndex
47 readonly property alias currentItem: gridView.currentItem
47 readonly property alias currentItem: gridView.currentItem
48
48
49− function contentHeightForRows(rows) {
49+ function contentHeightForRows(rows, height, vSpacing) {
50− return rows * cellHeight + verticalSpacing
50+ return rows * height + vSpacing
51 }
51 }
52
52
53 GridView {
53 GridView {