git.iko.soy/unity8
on xenial help sign in
remerge
commit978269d596243a4c27ecc22603d846d3dae3be58 authorAlbert Astals Cid <albert.astals@canonical.com> dateMon 17 Oct 2016, 11:16 (10 years ago) parentbbefb7dcb7ed26
3 files changed+15−13
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewAudioPlayback.qml+1 qml/Dash/Previews/PreviewRatingSingleDisplay.qml+11−11 qml/Dash/Previews/PreviewTextSummary.qml+3−2
qml/Dash/Previews/PreviewAudioPlayback.qml+1
@@ -141,6 +141,7 @@ PreviewWidget {
141141 opacity: 0.9
142142 color: scopeStyle ? scopeStyle.foreground : theme.palette.normal.baseText
143143 fontSize: "small"
144+ font.weight: Font.Light
144145 horizontalAlignment: Text.AlignRight
145146 text: DashAudioPlayer.lengthToString(modelData["length"])
146147 }
qml/Dash/Previews/PreviewRatingSingleDisplay.qml+11−11
@@ -30,6 +30,16 @@ Column {
3030 property alias urlIconHalf: ratingItem.urlIconHalf
3131 property alias labelColor: authorLabel.color
3232
33+ Label {
34+ id: authorLabel
35+ objectName: "authorLabel"
36+ anchors { left: parent.left; right: parent.right }
37+ opacity: .8
38+ fontSize: "small"
39+ visible: text !== ""
40+ wrapMode: Text.Wrap
41+ }
42+
3343 Rating {
3444 id: ratingItem
3545 objectName: "rating"
@@ -42,23 +52,13 @@ Column {
4252 property var urlIconHalf
4353 }
4454
45− Label {
46− id: authorLabel
47− objectName: "authorLabel"
48− anchors { left: parent.left; right: parent.right }
49− opacity: .8
50− font.size: "small"
51− visible: text !== ""
52− wrapMode: Text.Wrap
53− }
54−
5555 Label {
5656 id: reviewLabel
5757 objectName: "reviewLabel"
5858 anchors { left: parent.left; right: parent.right }
5959 color: authorLabel.color
6060 opacity: .8
61− font.size: "x-small"
61+ fontSize: "x-small"
6262 font.weight: Font.Light
6363 visible: text !== ""
6464 wrapMode: Text.Wrap
qml/Dash/Previews/PreviewTextSummary.qml+3−2
@@ -57,14 +57,15 @@ PreviewWidget {
5757 left: parent.left
5858 right: parent.right
5959 top: titleLabel.visible ? titleLabel.bottom : parent.top
60− topMargin: units.gu(1.5)
60+ topMargin: titleLabel.visible && visible ? units.gu(1.5) : 0
6161 }
62− height: (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount
62+ height: visible ? (lineCount <= maximumCollapsedLineCount || root.expanded) ? contentHeight : contentHeight / lineCount * maximumCollapsedLineCount : 0
6363 clip: true
6464 fontSize: "medium"
6565 font.weight: Font.Light
6666 lineHeight: 1.2
6767 color: root.scopeStyle ? root.scopeStyle.foreground : theme.palette.normal.baseText
68+ visible: text !== ""
6869 opacity: .8
6970 text: widgetData["text"] || ""
7071 wrapMode: Text.Wrap