git.iko.soy/unity8
on xenial help sign in
More tweaks
e903cd5Michal Hruby
qml/Dash/CardHeader.qml+5−1
compare with xenial
unifiedsplit
@@ -27,6 +27,7 @@ Item {
27 property alias altPrice: altPriceLabel.text
27 property alias altPrice: altPriceLabel.text
28
28
29 property alias titleWeight: titleLabel.font.weight
29 property alias titleWeight: titleLabel.font.weight
30+ property alias titleSize: titleLabel.fontSize
30
31
31 // FIXME: Saviq, used to scale fonts down in Carousel
32 // FIXME: Saviq, used to scale fonts down in Carousel
32 property real fontScale: 1.0
33 property real fontScale: 1.0
@@ -61,6 +62,7 @@ Item {
61 // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
62 // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
62 width: units.gu(6)
63 width: units.gu(6)
63 height: units.gu(5.625)
64 height: units.gu(5.625)
65+ anchors.verticalCenter: parent.verticalCenter
64 visible: useMascotShape && image && image.status === Image.Ready
66 visible: useMascotShape && image && image.status === Image.Ready
65 readonly property int maxSize: Math.max(width, height)
67 readonly property int maxSize: Math.max(width, height)
66
68
@@ -72,6 +74,7 @@ Item {
72
74
73 width: source ? mascotShape.width : 0
75 width: source ? mascotShape.width : 0
74 height: mascotShape.height
76 height: mascotShape.height
77+ anchors.verticalCenter: parent.verticalCenter
75 visible: !useMascotShape && status === Image.Ready
78 visible: !useMascotShape && status === Image.Ready
76
79
77 sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }
80 sourceSize { width: mascotShape.maxSize; height: mascotShape.maxSize }
@@ -83,7 +86,8 @@ Item {
83 Column {
86 Column {
84 objectName: "column"
87 objectName: "column"
85 width: parent.width - x
88 width: parent.width - x
86− spacing: units.gu(0.5)
89+ spacing: units.gu(0.25)
90+ anchors.verticalCenter: parent.verticalCenter
87
91
88 Label {
92 Label {
89 id: titleLabel
93 id: titleLabel
qml/Dash/Previews/PreviewActions.qml+1−1
@@ -24,7 +24,7 @@ import QtQuick 2.1
24PreviewWidget {
24PreviewWidget {
25 id: root
25 id: root
26
26
27− height: row.height
27+ height: row.height + units.gu(1)
28
28
29 Row {
29 Row {
30 id: row
30 id: row
qml/Dash/Previews/PreviewHeader.qml+3−1
@@ -34,5 +34,7 @@ PreviewWidget {
34 title: root.widgetData["title"] || ""
34 title: root.widgetData["title"] || ""
35 subtitle: root.widgetData["subtitle"] || ""
35 subtitle: root.widgetData["subtitle"] || ""
36 width: parent.width
36 width: parent.width
37+
38+ titleSize: "large"
37 }
39 }
38−}
40+}