Merge lp:~dandrader/unity-api/surfaceItemFillMode into lp:unity-api

[Daniel d'Andrada]

Add MirSurfaceItem.fillMode

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:186
http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-vivid-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-vivid-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-vivid-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-trunk-15.04-ci/7/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

debian/changelog merge is broken?

[Daniel d'Andrada (dandrader)]

On 14/09/15 04:49, Albert Astals Cid wrote:
> debian/changelog merge is broken?

Merged trunk again. That weird diff should go away.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-vivid-amd64-ci/8
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-vivid-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-vivid-armhf-ci/8/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trunk-15.04-vivid-i386-ci/8

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-trunk-15.04-ci/8/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity-api-ci/336/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/24/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/25/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/35/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/35
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/35/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/35/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/336/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:187
http://jenkins.qa.ubuntu.com/job/unity-api-ci/337/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/36
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/36
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/36/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/36

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/337/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

ack, lgtm.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:189
http://jenkins.qa.ubuntu.com/job/unity-api-ci/353/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/42/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/52
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/52
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/52/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/52

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/353/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

still good

review: Approve

[lp:~dandrader/unity-api/surfaceItemFillMode]

190. By Daniel d'Andrada on 2015-11-06

Merge trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:190
http://jenkins.qa.ubuntu.com/job/unity-api-ci/357/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/46
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/46/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/56

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-api-ci/357/rebuild

review: Approve (continuous-integration)

Unmerged revisions

190. By Daniel d'Andrada on 2015-11-06

Merge trunk

189. By Daniel d'Andrada on 2015-10-14

Merge mousePointer again

188. By Daniel d'Andrada on 2015-09-24

Merge mousePointer

187. By Daniel d'Andrada on 2015-09-15

Merge trunk-15.04

[ Michal Sawicz ]
* No change rebuild to resync vivid+overlay and wily
[ CI Train Bot ]
* No-change rebuild.

186. By Daniel d'Andrada on 2015-09-11

Add MirSurfaceItem.fillMode

=== modified file 'debian/changelog'
--- debian/changelog	2015-11-02 11:23:43 +0000
+++ debian/changelog	2015-11-06 16:31:15 +0000
@@ -1,7 +1,13 @@
+unity-api (7.103) UNRELEASED; urgency=medium
+
+  * Add MirSurfaceItem.fillMode
+
+ -- Daniel d'Andrada <[e-mail]>  Fri, 11 Sep 2015 08:54:29 -0300
+
 unity-api (7.102+16.04.20151102-0ubuntu1) xenial; urgency=medium
 
   [ Nick Dedekind ]
-  * Added visibility to surface interface. 
+  * Added visibility to surface interface.
 
   [ Michael Terry ]
   * Add isTouchApp to ApplicationInfoInterface

=== modified file 'include/unity/shell/application/MirSurfaceItemInterface.h'
--- include/unity/shell/application/MirSurfaceItemInterface.h	2015-09-29 11:34:31 +0000
+++ include/unity/shell/application/MirSurfaceItemInterface.h	2015-11-06 16:31:15 +0000
@@ -41,6 +41,8 @@
 {
     Q_OBJECT
 
+    Q_ENUMS(FillMode)
+
     /**
      * @brief The surface to be displayed
      */
@@ -103,7 +105,15 @@
                                 WRITE setSurfaceHeight
                                 NOTIFY surfaceHeightChanged)
 
+    Q_PROPERTY(FillMode fillMode READ fillMode WRITE setFillMode NOTIFY fillModeChanged)
+
 public:
+
+    enum FillMode {
+        Stretch,
+        PadOrCrop
+    };
+
     /// @cond
     MirSurfaceItemInterface(QQuickItem *parent = 0) : QQuickItem(parent) {}
     virtual ~MirSurfaceItemInterface() {}
@@ -129,6 +139,9 @@
 
     virtual int surfaceHeight() const = 0;
     virtual void setSurfaceHeight(int value) = 0;
+
+    virtual FillMode fillMode() const = 0;
+    virtual void setFillMode(FillMode value) = 0;
     /// @endcond
 
 Q_SIGNALS:
@@ -142,6 +155,7 @@
     void surfaceWidthChanged(int value);
     void surfaceHeightChanged(int value);
     void nameChanged(const QString &name);
+    void fillModeChanged(FillMode value);
     /// @endcond
 };