5a8284e · unity8 · git.iko.soy

qml/Dash/Previews/PreviewComment.qml+1

compare with xenial

unifiedsplit

@@ -41,6 +41,7 @@ PreviewWidget {

41 source: widgetData["source"]

42 }

43 radius: "medium"

44+ aspect: UbuntuShape.Flat

44 opacity: source.status === Image.Ready ? 1 : 0

45 opacity: source.status === Image.Ready ? 1 : 0

45 visible: widgetData["source"] !== ""

46 visible: widgetData["source"] !== ""

46 }

47 }

tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+1−1

@@ -123,7 +123,7 @@ Rectangle {

123

124 function test_dimensions_data() {

125 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" },

127 { tag: "Header height", object: previewHeader, height: function() { return outerRow.height + outerRow.margins * 2 } },

128 ]

129 }

tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml+2−2

@@ -64,7 +64,7 @@ Rectangle {

64 function test_optional_title() {

65 // verify titleLabel is visible and textLabel is anchored below it

66 compare(titleLabel.visible, true)

67− tryCompare(textLabel, "y", titleLabel.height)

67+ tryCompare(textLabel, "y", titleLabel.height + textLabel.anchors.topMargin)

68

69 // verify titleLabel disappears and textLabel moves up

70 previewTextSummary.widgetData = widgetDataNoTitle

@@ -81,7 +81,7 @@ Rectangle {

81 previewTextSummary.widgetData = widgetDataShortText

82 verify(textLabel.lineCount <= textLabel.maximumCollapsedLineCount)

83 tryCompare(textLabel, "height", textLabel.contentHeight)

84− tryCompare(previewTextSummary, "height", titleLabel.height + textLabel.height)

84+ tryCompare(previewTextSummary, "height", titleLabel.height + textLabel.height + textLabel.anchors.topMargin)

85 }

86 }

87}