on xenial help sign in
Strip the remaining special casing of libertine scope as well.
commitb473e44a7367e748a9a4500d610abc78c535fa5d authorRodney Dawes <rodney.dawes@canonical.com> dateFri 27 Jan 2017, 11:15 (10 years ago) parent9966be2
2 files changed+4−27
qml/Dash/CardGrid.qml+2−2 qml/Dash/CardTool.qml+2−25
qml/Dash/CardGrid.qml+2−2
@@ -26,7 +26,7 @@ DashRenderer {
2626 }
2727
2828 // ↓ This is the ubuntu store icon
29− readonly property string backgroundShapeStyle: cardTool.isAppLikeScope && !cardTool.isAppLikeScopeAppCategory ? "shadow" : "flat"
29+ readonly property string backgroundShapeStyle: "flat"
3030
3131 expandedHeight: grid.totalContentHeight
3232 collapsedHeight: Math.min(grid.contentHeightForRows(collapsedRows, grid.cellHeight), expandedHeight)
@@ -46,7 +46,7 @@ DashRenderer {
4646 ResponsiveGridView {
4747 id: grid
4848 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)
5050 delegateWidth: cardTool.cardWidth
5151 delegateHeight: cardTool.cardHeight
5252 verticalSpacing: units.gu(1)
qml/Dash/CardTool.qml+2−25
@@ -77,15 +77,8 @@ Item {
7777 return layout;
7878 }
7979
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−
8380 readonly property string artShapeStyle: {
84− if (isAppLikeScope) {
85− return isAppLikeScopeAppCategory ? "icon" : "flat";
86− } else {
87− return categoryLayout === "carousel" ? "shadow" : "flat"
88− }
81+ return categoryLayout === "carousel" ? "shadow" : "flat"
8982 }
9083
9184 // FIXME ? This seems like it should not be needed, but on Qt 5.4 + phone
@@ -120,18 +113,6 @@ Item {
120113 If -1, should use implicit width of the actual card.
121114 */
122115 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−
135116 switch (categoryLayout) {
136117 case "grid":
137118 case "vertical-journal":
@@ -190,11 +171,7 @@ Item {
190171 readonly property int headerHeight: cardLoader.item ? cardLoader.item.headerHeight : 0
191172
192173 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)
197− }
174+ return cardLoader.item ? cardLoader.item.artShapeSize : Qt.size(0, 0)
198175 }
199176
200177 QtObject {