Merge lp:~dandrader/unity8/surfaceItemFillMode into lp:unity8

[Daniel d'Andrada]

MirSurfaceItem got a new property: fillMode

And put it to use in SurfaceContainer. That's the final piece to finally get rid of stretched windows

* Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~dandrader/unity-api/surfaceItemFillMode2/+merge/278955
https://code.launchpad.net/~dandrader/qtmir/surfaceItemFillMode/+merge/274750

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

* Did you make sure that your branch does not contain spurious tags?
Yes

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

* If you changed the UI, has there been a design review?
Not applicable

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2075
http://jenkins.qa.ubuntu.com/job/unity8-ci/6843/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5502/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/258/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1554/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/257/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1449/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1449/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/256/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/255/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5516/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/257/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6843/rebuild

review: Needs Fixing (continuous-integration)

[Albert Astals Cid (aacid)]

Initialize m_fillMode to something even if it's only a mock?

[lp:~dandrader/unity8/surfaceItemFillMode]

2076. By Daniel d'Andrada on 2015-12-01

Initialize m_fillMode in MirSurfaceItem mock

[Daniel d'Andrada (dandrader)]

On 01/12/2015 06:45, Albert Astals Cid wrote:
> Initialize m_fillMode to something even if it's only a mock?

Done.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:2076
http://jenkins.qa.ubuntu.com/job/unity8-ci/6852/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/5518/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/267/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1563/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/266/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1458/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1458/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/265/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/5532/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/266/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/6852/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Not enough unity-api
 * Did you make sure that the branch does not contain spurious tags?
Y

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-11-26 13:51:24 +0000
+++ CMakeLists.txt	2015-12-01 10:36:00 +0000
@@ -57,7 +57,7 @@
 find_package(Qt5Concurrent 5.4 REQUIRED)
 find_package(Qt5Sql 5.4 REQUIRED)
 
-pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=11)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=12)
 
 # Standard install paths
 include(GNUInstallDirs)

=== modified file 'debian/control'
--- debian/control	2015-11-26 13:51:24 +0000
+++ debian/control	2015-12-01 10:36:00 +0000
@@ -29,7 +29,7 @@
                libqt5xmlpatterns5-dev,
                libsystemsettings-dev,
                libudev-dev,
-               libunity-api-dev (>= 7.103),
+               libunity-api-dev (>= 7.104),
                libusermetricsoutput1-dev,
                libxcb1-dev,
                pkg-config,
@@ -128,7 +128,7 @@
          qtdeclarative5-ubuntu-ui-toolkit-plugin (>= 1.3.1627) | qtdeclarative5-ubuntu-ui-toolkit-plugin-gles (>= 1.3.1627),
          qtdeclarative5-unity-notifications-plugin (>= 0.1.2) | unity-notifications-impl,
          ubuntu-thumbnailer-impl-0,
-         unity-application-impl-11,
+         unity-application-impl-12,
          unity-notifications-impl-3,
          unity-plugin-scopes | unity-scopes-impl,
          unity-scopes-impl-7,
@@ -174,7 +174,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
 Provides: unity-application-impl,
-          unity-application-impl-11,
+          unity-application-impl-12,
 Replaces: unity8-autopilot (<< 8.02+15.04.20150422-0ubuntu1)
 Description: Fake environment for running Unity 8 shell
  Provides fake implementations of some QML modules used by Unity 8 shell

=== modified file 'qml/Stages/SurfaceContainer.qml'
--- qml/Stages/SurfaceContainer.qml	2015-11-09 12:04:46 +0000
+++ qml/Stages/SurfaceContainer.qml	2015-12-01 10:36:00 +0000
@@ -55,6 +55,7 @@
         id: surfaceItem
         objectName: "surfaceItem"
 
+        fillMode: MirSurfaceItem.PadOrCrop
         consumesInput: true
 
         surfaceWidth: {

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.cpp'
--- tests/mocks/Unity/Application/MirSurfaceItem.cpp	2015-11-09 12:04:46 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.cpp	2015-12-01 10:36:00 +0000
@@ -305,3 +305,11 @@
         m_qmlSurface->resize(m_surfaceWidth, m_surfaceHeight);
     }
 }
+
+void MirSurfaceItem::setFillMode(FillMode value)
+{
+    if (value != m_fillMode) {
+        m_fillMode = value;
+        Q_EMIT fillModeChanged(m_fillMode);
+    }
+}

=== modified file 'tests/mocks/Unity/Application/MirSurfaceItem.h'
--- tests/mocks/Unity/Application/MirSurfaceItem.h	2015-11-09 12:04:46 +0000
+++ tests/mocks/Unity/Application/MirSurfaceItem.h	2015-12-01 10:36:00 +0000
@@ -62,6 +62,9 @@
     int surfaceHeight() const override;
     void setSurfaceHeight(int value) override;
 
+    FillMode fillMode() const override { return m_fillMode; }
+    void setFillMode(FillMode value) override;
+
     /////
     // For use in qml tests
 
@@ -107,6 +110,8 @@
     int m_touchPressCount;
     int m_touchReleaseCount;
 
+    FillMode m_fillMode{Stretch};
+
     friend class SurfaceManager;
 };