git.iko.soy/unity8
on xenial help sign in
Re-merge lp:~unity-team/unity8/unity8.preview_video
commit1bb5e06f3c97a5cda78ab87d661ad70c4fa97985 authorMichal Hruby <michal.mhr@gmail.com> dateWed 12 Feb 2014, 13:00 (13 years ago) parent39b88dfaf97ede
2 files changed+2−1
compare with xenial
unifiedsplit
qml/Dash/Previews/PreviewVideoPlayback.qml+1 tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+1−1
qml/Dash/Previews/PreviewVideoPlayback.qml+1
@@ -27,6 +27,7 @@ import "../../Components"
2727PreviewWidget {
2828 id: root
2929 implicitWidth: units.gu(35)
30+ implicitHeight: childrenRect.height
3031
3132 LazyImage {
3233 objectName: "screenshot"
tests/qmltests/Dash/Previews/tst_PreviewWidgetFactory.qml+1−1
@@ -77,9 +77,9 @@ Rectangle {
7777 return [
7878 { tag: "Actions", type: "actions", source: "PreviewActions.qml" },
7979 { tag: "Audio", type: "audio", source: "PreviewAudioPlayback.qml" },
80− { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
8180 { tag: "Gallery", type: "gallery", source: "PreviewImageGallery.qml" },
8281 { tag: "Header", type: "header", source: "PreviewHeader.qml" },
82+ { tag: "Image", type: "image", source: "PreviewZoomableImage.qml" },
8383 { tag: "Text", type: "text", source: "PreviewTextSummary.qml" },
8484 { tag: "Video", type: "video", source: "PreviewVideoPlayback.qml" },
8585 ];