git.iko.soy/unity8
on xenial help sign in
Re-merge lp:~unity-team/unity8/unity8.preview_video
1bb5e06Michal Hruby
qml/Dash/Previews/PreviewVideoPlayback.qml+1
compare with xenial
unifiedsplit
@@ -27,6 +27,7 @@ import "../../Components"
27PreviewWidget {
27PreviewWidget {
28 id: root
28 id: root
29 implicitWidth: units.gu(35)
29 implicitWidth: units.gu(35)
30+ implicitHeight: childrenRect.height
30
31
31 LazyImage {
32 LazyImage {
32 objectName: "screenshot"
33 objectName: "screenshot"
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+1−1
@@ -77,9 +77,9 @@ Rectangle {
77 return [
77 return [
78 { tag: "Actions", type: "actions", source: "PreviewActions.qml" },
78 { tag: "Actions", type: "actions", source: "PreviewActions.qml" },
79 { tag: "Audio", type: "audio", source: "PreviewAudioPlayback.qml" },
79 { tag: "Audio", type: "audio", source: "PreviewAudioPlayback.qml" },
80− { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
81 { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml" },
80 { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml" },
82 { tag: "Header", type: "header", source: "PreviewHeader.qml" },
81 { tag: "Header", type: "header", source: "PreviewHeader.qml" },
82+ { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
83 { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
83 { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
84 { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },
84 { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },
85 ];
85 ];