git.iko.soy/unity8
on xenial help sign in
More merging
commit5a8284ebd0b65ae03a9c96a7175796be06ca48ca authorAlbert Astals Cid <albert.astals@canonical.com> dateMon 17 Oct 2016, 14:47 (10 years ago) parent978269dc386158
3 files changed+4−3
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewComment.qml+1 tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+1−1 tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml+2−2
qml/Dash/Previews/PreviewComment.qml+1
@@ -41,6 +41,7 @@ PreviewWidget {
4141 source: widgetData["source"]
4242 }
4343 radius: "medium"
44+ aspect: UbuntuShape.Flat
4445 opacity: source.status === Image.Ready ? 1 : 0
4546 visible: widgetData["source"] !== ""
4647 }
tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+1−1
@@ -123,7 +123,7 @@ Rectangle {
123123
124124 function test_dimensions_data() {
125125 return [
126− { tag: "Column width with mascot", object: column, width: previewHeader.width - mascotShapeLoader.width - outerRow.margins * 3, mascot: "artwork/avatar.png" },
126+ { tag: "Column width with mascot", object: column, width: previewHeader.width - mascotShapeLoader.width - outerRow.margins * 2, mascot: "artwork/avatar.png" },
127127 { tag: "Header height", object: previewHeader, height: function() { return outerRow.height + outerRow.margins * 2 } },
128128 ]
129129 }
tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml+2−2
@@ -64,7 +64,7 @@ Rectangle {
6464 function test_optional_title() {
6565 // verify titleLabel is visible and textLabel is anchored below it
6666 compare(titleLabel.visible, true)
67− tryCompare(textLabel, "y", titleLabel.height)
67+ tryCompare(textLabel, "y", titleLabel.height + textLabel.anchors.topMargin)
6868
6969 // verify titleLabel disappears and textLabel moves up
7070 previewTextSummary.widgetData = widgetDataNoTitle
@@ -81,7 +81,7 @@ Rectangle {
8181 previewTextSummary.widgetData = widgetDataShortText
8282 verify(textLabel.lineCount <= textLabel.maximumCollapsedLineCount)
8383 tryCompare(textLabel, "height", textLabel.contentHeight)
84− tryCompare(previewTextSummary, "height", titleLabel.height + textLabel.height)
84+ tryCompare(previewTextSummary, "height", titleLabel.height + textLabel.height + textLabel.anchors.topMargin)
8585 }
8686 }
8787}