git.iko.soy/unity8
on xenial help sign in
Merge and whitespace
396e8bcAndrea Cimitan
qml/Dash/CardGrid.qml+1−1
compare with xenial
unifiedsplit
@@ -26,7 +26,7 @@ DashRenderer {
26 }
26 }
27 // hackish, relies on GenericScopeView.qml:335 tweak to detect application icons in click scope
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";
28 readonly property var artShapeStyle: cardTool.artShapeSize === Qt.size(units.gu(8), units.gu(7.5)) ? "icon" : "inset";
29−
29+
30 expandedHeight: grid.totalContentHeight
30 expandedHeight: grid.totalContentHeight
31 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
31 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
32 collapsedItemCount: collapsedRows * grid.columns
32 collapsedItemCount: collapsedRows * grid.columns
tests/qmltests/Dash/Previews/tst_PreviewIconActions.qml+1−1
@@ -18,7 +18,7 @@ import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import "../../../../qml/Dash/Previews"
19import "../../../../qml/Dash/Previews"
20import Unity.Test 0.1 as UT
20import Unity.Test 0.1 as UT
21−import Ubuntu.Components 0.1
21+import Ubuntu.Components 1.3
22
22
23
23
24Rectangle {
24Rectangle {