Merge lp:~aacid/unity8/addPaddingBetweenPreviewColumns into lp:unity8

[Albert Astals Cid]

Rework Dash Preview column margins

    If there's one column
     Preview widgets have 2GU on each side
      Unless it's one of the "full screen" widgets, i.e. video/image
     This hasn't changed in this patch

    If there's two columns
     the columns have 4GU on each side and between eachother
     This has changed according to design guidelines

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
It's based on design input.

[lp:~aacid/unity8/addPaddingBetweenPreviewColumns]

2657. By Albert Astals Cid on 2016-10-04

Default is false (not that it matters but anyway)

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2657
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2312/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3046
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1693
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1693
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1693
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3074
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2931
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2931/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2931
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2931/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2931
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2931/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2931
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2931/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2931
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2931/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2931
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2931/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2931
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2931/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2931
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2931/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2931
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2931/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2312/rebuild

review: Needs Fixing (continuous-integration)

[lp:~aacid/unity8/addPaddingBetweenPreviewColumns]

2658. By Albert Astals Cid on 2016-10-05

Put the combo preview at the end, tests want it there

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2658
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2313/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3050
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1696
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1696
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1696
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3078
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2935
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2935/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2935
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2935/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2935
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2935/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2935
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2935/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2935
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2935/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2935
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2935/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2935
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2935/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2935
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2935/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2935
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2935/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2313/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

Code is fine, need to double check with design but this is as requested

[Andrea Cimitan (cimi)]

I jusr realised, looking at the mockups, that we should have the same 4gu padding also on the top of the columns (so probably 2 in portrait), shall we add these here or a new branch?

review: Needs Information

[Andrea Cimitan (cimi)]

> I jusr realised, looking at the mockups, that we should have the same 4gu
> padding also on the top of the columns (so probably 2 in portrait), shall we
> add these here or a new branch?

if needed lp:~unity-team/unity8/addPaddingBetweenPreviewColumns

[Albert Astals Cid (aacid)]

I'm sincerely not convinced http://bazaar.launchpad.net/~unity-team/unity8/addPaddingBetweenPreviewColumns/revision/2659 is a good idea, the problem is, you're resizing the window horizontally and suddenly not only the items are rearranged horizontally (new columns or horizontal spacing) but they also jump vertically.

I think that doesn't make sense.

[lp:~aacid/unity8/addPaddingBetweenPreviewColumns]

2659. By Albert Astals Cid on 2016-10-13

Change topMargin based on width

I think it's not a good idea to change the vertical spacing while you do an horizontal resize, but i'm not a designer, so do what Cimi suggested

[Albert Astals Cid (aacid)]

Added your changeset anyway.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2659
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2369/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3122
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1766
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1766
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1766
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3150
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3006/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3006
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3006/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2369/rebuild

review: Approve (continuous-integration)

[lp:~aacid/unity8/addPaddingBetweenPreviewColumns]

2660. By Albert Astals Cid on 2016-10-14

top&bottom margin 2gu+clip

2661. By Albert Astals Cid on 2016-10-14

No bottom margin

2662. By Albert Astals Cid on 2016-10-14

units.gu(2) on the left/right also for the 2 columns scenario

2663. By Albert Astals Cid on 2016-10-14

make it just be some margin on the top of the contents, not a fix margin

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:2660
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2382/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3133
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1777
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1777
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1777
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3161
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3017
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3017/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3017
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3017/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3017
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3017/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3017
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3017/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3017
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3017/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3017
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3017/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3017
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3017/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3017
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3017/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3017
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3017/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2382/rebuild

review: Needs Fixing (continuous-integration)

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2663
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2385/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3136
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1780
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1780
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=yakkety,testname=qmluitests.sh/1780
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3164
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/3020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/3020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3020/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3020
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/3020/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2385/rebuild

review: Approve (continuous-integration)

[Andrea Cimitan (cimi)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
yes
 * Did CI run pass? If not, please explain why.
it passed

review: Approve

[Andrea Cimitan (cimi)]

tests seems to be a bit flaky, can you have a look at it please?
qmltestrunner.Dash::test_close_temp_scope_preview_opening_scope
qmltestrunner.Preview::test_comboEnsureVisible
qmltestrunner.Preview::test_containOnFocus

[Albert Astals Cid (aacid)]

As discussed last friday the flakyness doesn't seem to be introduced by this branch, right?

=== modified file 'qml/Dash/Previews/Preview.qml'
--- qml/Dash/Previews/Preview.qml	2016-06-27 18:41:15 +0000
+++ qml/Dash/Previews/Preview.qml	2016-10-14 14:58:15 +0000
@@ -56,11 +56,12 @@
     Row {
         id: row
 
-        spacing: units.gu(1)
-        anchors { fill: parent; margins: spacing }
+        spacing: units.gu(4)
+        anchors.fill: parent
 
-        property int columns: width >= units.gu(80) ? 2 : 1
-        property real columnWidth: width / columns
+        readonly property int columns: width >= units.gu(80) ? 2 : 1
+        readonly property real columnWidth: (width - (spacing * (columns - 1))) / columns
+        readonly property int singleColumnMargin: units.gu(2)
 
         Repeater {
             model: previewModel
@@ -72,8 +73,11 @@
                     top: parent.top
                     bottom: parent.bottom
                 }
+                topMargin: units.gu(2)
                 width: row.columnWidth
-                spacing: row.spacing
+                spacing: units.gu(1)
+
+                readonly property int columnNumber: index
 
                 ListViewOSKScroller {
                     id: oskScroller
@@ -96,8 +100,16 @@
                     anchors {
                         left: parent.left
                         right: parent.right
-                        leftMargin: widgetMargins
-                        rightMargin: widgetMargins
+                        leftMargin: if (row.columns == 1) {
+                                        return singleColumnMarginless ? 0 : row.singleColumnMargin;
+                                    } else {
+                                        return column.columnNumber == 0 ? row.singleColumnMargin : 0;
+                                    }
+                        rightMargin: if (row.columns == 1) {
+                                        return singleColumnMarginless ? 0 : row.singleColumnMargin;
+                                    } else {
+                                        return column.columnNumber == 1 ? row.singleColumnMargin : 0;
+                                    }
                     }
 
                     onTriggered: {

=== modified file 'qml/Dash/Previews/PreviewInlineVideo.qml'
--- qml/Dash/Previews/PreviewInlineVideo.qml	2016-07-27 14:25:44 +0000
+++ qml/Dash/Previews/PreviewInlineVideo.qml	2016-10-14 14:58:15 +0000
@@ -33,7 +33,7 @@
     implicitWidth: units.gu(35)
     implicitHeight: services.height
 
-    widgetMargins: -units.gu(1)
+    singleColumnMarginless: true
     orientationLock: services.fullscreen
 
     property alias rootItem: services.rootItem

=== modified file 'qml/Dash/Previews/PreviewVideoPlayback.qml'
--- qml/Dash/Previews/PreviewVideoPlayback.qml	2016-05-03 09:45:41 +0000
+++ qml/Dash/Previews/PreviewVideoPlayback.qml	2016-10-14 14:58:15 +0000
@@ -30,7 +30,7 @@
     implicitWidth: units.gu(35)
     implicitHeight: childrenRect.height
 
-    widgetMargins: -units.gu(1)
+    singleColumnMarginless: true
 
     LazyImage {
         objectName: "screenshot"

=== modified file 'qml/Dash/Previews/PreviewWidget.qml'
--- qml/Dash/Previews/PreviewWidget.qml	2016-06-01 16:05:12 +0000
+++ qml/Dash/Previews/PreviewWidget.qml	2016-10-14 14:58:15 +0000
@@ -34,8 +34,8 @@
     //! Should the orientation be locked
     property bool orientationLock: false
 
-    //! Set margins width.
-    property real widgetMargins: units.gu(1)
+    //! Should it have margins when on a single columns?
+    property bool singleColumnMarginless: false
 
     /// The parent (vertical) flickable this widget is in (if any)
     property var parentFlickable: null

=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
--- qml/Dash/Previews/PreviewWidgetFactory.qml	2016-06-09 14:45:57 +0000
+++ qml/Dash/Previews/PreviewWidgetFactory.qml	2016-10-14 14:58:15 +0000
@@ -40,8 +40,8 @@
     //! Should the orientation be locked
     readonly property bool orientationLock: status === Loader.Ready ? item.orientationLock : false
 
-    //! Set margins width.
-    property real widgetMargins: status === Loader.Ready ? item.widgetMargins : units.gu(1)
+    //! Should it have margins when on a single columns?
+    readonly property bool singleColumnMarginless: status === Loader.Ready ? item.singleColumnMarginless : false
 
     /// The parent (vertical) flickable this widget is in (if any)
     property var parentFlickable: null

=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
--- qml/Dash/Previews/PreviewZoomableImage.qml	2016-06-01 16:05:12 +0000
+++ qml/Dash/Previews/PreviewZoomableImage.qml	2016-10-14 14:58:15 +0000
@@ -30,7 +30,7 @@
     implicitWidth: units.gu(35)
     implicitHeight: lazyImage.height
 
-    widgetMargins: -units.gu(1)
+    singleColumnMarginless: true
     orientationLock: overlay.visible
 
     property Item rootItem: QuickUtils.rootItem(root)

=== modified file 'tests/mocks/Unity/fake_previewmodel.cpp'
--- tests/mocks/Unity/fake_previewmodel.cpp	2016-05-26 12:52:24 +0000
+++ tests/mocks/Unity/fake_previewmodel.cpp	2016-10-14 14:58:15 +0000
@@ -34,22 +34,30 @@
  , m_loaded(true)
  , m_scope(scope)
 {
-    // we have one column by default
-    PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);
-    m_previewWidgetModels.append(columnModel);
+    setWidgetColumnCount(1);
     connect(this, &PreviewModel::triggered, this, &PreviewModel::triggeredSlot);
 }
 
 void PreviewModel::setWidgetColumnCount(int count)
 {
-    if (count != 1) {
-        qWarning("PreviewModel::setWidgetColumnCount != 1 not implemented");
+    if (count != widgetColumnCount()) {
+        beginResetModel();
+
+        m_previewWidgetModels.clear();
+        for (int i = 0; i < count; ++i) {
+            PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);
+            m_previewWidgetModels.append(columnModel);
+        }
+
+        endResetModel();
+
+        Q_EMIT widgetColumnCountChanged();
     }
 }
 
 int PreviewModel::widgetColumnCount() const
 {
-    return 1;
+    return m_previewWidgetModels.size();
 }
 
 bool PreviewModel::loaded() const
@@ -64,7 +72,7 @@
 
 int PreviewModel::rowCount(const QModelIndex&) const
 {
-    return m_previewWidgetModels.size();
+    return widgetColumnCount();
 }
 
 QVariant PreviewModel::data(const QModelIndex& index, int role) const

=== modified file 'tests/mocks/Unity/fake_previewwidgetmodel.cpp'
--- tests/mocks/Unity/fake_previewwidgetmodel.cpp	2015-02-11 17:17:20 +0000
+++ tests/mocks/Unity/fake_previewwidgetmodel.cpp	2016-10-14 14:58:15 +0000
@@ -54,18 +54,26 @@
         m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
     }
 
-    QVariantMap attributes;
-    QVariantMap buttonData;
-    buttonData["label"] = "Button";
-    buttonData["id"] = "open_click";
-    QVariantList buttons;
-    buttons << buttonData << buttonData << buttonData;
-    attributes["actions"] = QVariant::fromValue(buttons);
-    PreviewData* preview_data = new PreviewData(QString("widget-21"), QString("actions"), attributes);
-    m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
+    {
+        QVariantMap attributes;
+        attributes["source"] = QVariant("qrc:///Unity/Application/screenshots/[e-mail]");
+        PreviewData* preview_data = new PreviewData(QString("widget-22"), QString("image"), attributes);
+        m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
+    }
+
+    {
+        QVariantMap attributes;
+        QVariantMap buttonData;
+        buttonData["label"] = "Button";
+        buttonData["id"] = "open_click";
+        QVariantList buttons;
+        buttons << buttonData << buttonData << buttonData;
+        attributes["actions"] = QVariant::fromValue(buttons);
+        PreviewData* preview_data = new PreviewData(QString("widget-21"), QString("actions"), attributes);
+        m_previewWidgets.append(QSharedPointer<PreviewData>(preview_data));
+    }
 
     endResetModel();
-
 }
 
 int PreviewWidgetModel::rowCount(const QModelIndex&) const