git.iko.soy/unity8
on xenial help sign in
Strip the remaining special casing of libertine scope as well.
b473e44Rodney Dawes
qml/Dash/CardGrid.qml+2−2
compare with xenial
unifiedsplit
@@ -26,7 +26,7 @@ DashRenderer {
26 }
26 }
27
27
28 // ↓ This is the ubuntu store icon
28 // ↓ This is the ubuntu store icon
29− readonly property string backgroundShapeStyle: cardTool.isAppLikeScope && !cardTool.isAppLikeScopeAppCategory ? "shadow" : "flat"
29+ readonly property string backgroundShapeStyle: "flat"
30
30
31 expandedHeight: grid.totalContentHeight
31 expandedHeight: grid.totalContentHeight
32 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
32 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
@@ -46,7 +46,7 @@ DashRenderer {
46 ResponsiveGridView {
46 ResponsiveGridView {
47 id: grid
47 id: grid
48 anchors.fill: parent
48 anchors.fill: parent
49− minimumHorizontalSpacing: (cardTool.isAppLikeScopeAppCategory && cardTool.isWideView) ? units.gu(5) : units.gu(1)
49+ minimumHorizontalSpacing: cardTool.isWideView ? units.gu(5) : units.gu(1)
50 delegateWidth: cardTool.cardWidth
50 delegateWidth: cardTool.cardWidth
51 delegateHeight: cardTool.cardHeight
51 delegateHeight: cardTool.cardHeight
52 verticalSpacing: units.gu(1)
52 verticalSpacing: units.gu(1)
qml/Dash/CardTool.qml+2−25
@@ -77,15 +77,8 @@ Item {
77 return layout;
77 return layout;
78 }
78 }
79
79
80− readonly property bool isAppLikeScope: scopeId === "libertine-scope.ubuntu_libertine-scope"
81− readonly property bool isAppLikeScopeAppCategory: (scopeId === "libertine-scope.ubuntu_libertine-scope" && categoryId !== "hint")
82−
83 readonly property string artShapeStyle: {
80 readonly property string artShapeStyle: {
84− if (isAppLikeScope) {
85− return isAppLikeScopeAppCategory ? "icon" : "flat";
86− } else {
87− return categoryLayout === "carousel" ? "shadow" : "flat"
81+ return categoryLayout === "carousel" ? "shadow" : "flat"
88− }
89 }
82 }
90
83
91 // FIXME ? This seems like it should not be needed, but on Qt 5.4 + phone
84 // FIXME ? This seems like it should not be needed, but on Qt 5.4 + phone
@@ -120,18 +113,6 @@ Item {
120 If -1, should use implicit width of the actual card.
113 If -1, should use implicit width of the actual card.
121 */
114 */
122 readonly property real cardWidth: {
115 readonly property real cardWidth: {
123− if (isAppLikeScopeAppCategory) {
124− if (!isNarrowView) {
125− if (isWideView) {
126− return units.gu(11);
127− } else {
128− return units.gu(10);
129− }
130− } else {
131− return units.gu(12);
132− }
133− }
134−
135 switch (categoryLayout) {
116 switch (categoryLayout) {
136 case "grid":
117 case "grid":
137 case "vertical-journal":
118 case "vertical-journal":
@@ -190,11 +171,7 @@ Item {
190 readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0
171 readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0
191
172
192 readonly property size artShapeSize: {
173 readonly property size artShapeSize: {
193− if (isAppLikeScopeAppCategory) {
194− return Qt.size(units.gu(8), units.gu(7.5));
195− } else {
196− return cardLoader.item ? cardLoader.item.artShapeSize : Qt.size(0, 0)
174+ return cardLoader.item ? cardLoader.item.artShapeSize : Qt.size(0, 0)
197− }
198 }
175 }
199
176
200 QtObject {
177 QtObject {