git.iko.soy/unity8
on xenial help sign in
lp:~unity-team/unity8/newscopes-card-overlay
d8c12f1Michał Sawicz
qml/Dash/CardCarousel.qml+7
compare with xenial
unifiedsplit
@@ -55,9 +55,13 @@ DashRenderer {
55 onClicked: cardCarousel.clicked(index, itemY)
55 onClicked: cardCarousel.clicked(index, itemY)
56 onPressAndHold: cardCarousel.pressAndHold(index, itemY)
56 onPressAndHold: cardCarousel.pressAndHold(index, itemY)
57
57
58+ property real fontScale: 1 / selectedItemScaleFactor
59+ property real headerHeight: cardTool.headerHeight / selectedItemScaleFactor
60+
58 itemComponent: Card {
61 itemComponent: Card {
59 id: card
62 id: card
60 objectName: "delegate" + index
63 objectName: "delegate" + index
64+ headerHeight: carousel.headerHeight
61 cardData: model
65 cardData: model
62 template: cardCarousel.template
66 template: cardCarousel.template
63 components: cardCarousel.components
67 components: cardCarousel.components
@@ -66,6 +70,9 @@ DashRenderer {
66 property var model
70 property var model
67
71
68 enabled: false
72 enabled: false
73+ showHeader: explicitlyScaled
74+
75+ fontScale: carousel.fontScale
69 }
76 }
70 }
77 }
71}
78}
qml/Dash/CardFilterGrid.qml+1
@@ -39,6 +39,7 @@ DashFilterGrid {
39 id: card
39 id: card
40 width: cardTool.cardWidth
40 width: cardTool.cardWidth
41 height: cardTool.cardHeight
41 height: cardTool.cardHeight
42+ headerHeight: cardTool.headerHeight
42 anchors.horizontalCenter: parent.horizontalCenter
43 anchors.horizontalCenter: parent.horizontalCenter
43 objectName: "delegate" + index
44 objectName: "delegate" + index
44 cardData: model
45 cardData: model