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

[Daniel d'Andrada]

MirSurfaceInterface: added size hints

MirSurfaceInterface: added size hints

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:197
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dandrader/unity-api/surfaceItemSizeHints/+merge/278740/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-api-ci/366/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/55
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/55/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/65
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/65
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/65/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/65

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Lukáš Tinkl (lukas-kde)]

LGTM, approving

review: Approve

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

202. By Daniel d'Andrada on 2015-12-07

Add MirSurfaceItem.fillMode
Approved by: Michael Zanetti

203. By Michael Terry on 2015-12-07

Added ApplicationInfoInterface::exemptFromLifecycle Fixes: #1518764
Approved by: PS Jenkins bot, Daniel d'Andrada

204. By CI Train Bot Account on 2015-12-07

Releasing 7.104+16.04.20151207-0ubuntu1

205. By Daniel d'Andrada on 2015-12-14

MirSurfaceInterface: added size hints

Unmerged revisions

205. By Daniel d'Andrada on 2015-12-14

MirSurfaceInterface: added size hints

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-07 16:21:29 +0000
+++ debian/changelog	2015-12-14 10:04:26 +0000
@@ -1,3 +1,9 @@
+unity-api (7.105) UNRELEASED; urgency=medium
+
+  * MirSurfaceInterface: added size hints
+
+ -- Daniel d'Andrada <[e-mail]>  Mon, 14 Dec 2015 07:53:47 -0200
+
 unity-api (7.104+16.04.20151207-0ubuntu1) xenial; urgency=medium
 
   [ Daniel d'Andrada ]

=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt	2015-12-03 19:32:37 +0000
+++ include/unity/shell/application/CMakeLists.txt	2015-12-14 10:04:26 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 12)
+set(VERSION 13)
 set(PKGCONFIG_NAME "unity-shell-application")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")

=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
--- include/unity/shell/application/MirSurfaceInterface.h	2015-10-26 18:26:01 +0000
+++ include/unity/shell/application/MirSurfaceInterface.h	2015-12-14 10:04:26 +0000
@@ -78,6 +78,42 @@
     Q_PROPERTY(Mir::OrientationAngle orientationAngle READ orientationAngle WRITE setOrientationAngle
                NOTIFY orientationAngleChanged DESIGNABLE false)
 
+    /**
+     * @brief The requested minimum width for the surface
+     * Zero if not set
+     */
+    Q_PROPERTY(int minimumWidth READ minimumWidth NOTIFY minimumWidthChanged)
+
+    /**
+     * @brief The requested minimum height for the surface
+     * Zero if not set
+     */
+    Q_PROPERTY(int minimumHeight READ minimumHeight NOTIFY minimumHeightChanged)
+
+    /**
+     * @brief The requested maximum width for the surface
+     * Zero if not set
+     */
+    Q_PROPERTY(int maximumWidth READ maximumWidth NOTIFY maximumWidthChanged)
+
+    /**
+     * @brief The requested maximum height for the surface
+     * Zero if not set
+     */
+    Q_PROPERTY(int maximumHeight READ maximumHeight NOTIFY maximumHeightChanged)
+
+    /**
+     * @brief The requested width increment for the surface
+     * Zero if not set
+     */
+    Q_PROPERTY(int widthIncrement READ widthIncrement NOTIFY widthIncrementChanged)
+
+    /**
+     * @brief The requested height increment for the surface
+     * Zero if not set
+     */
+    Q_PROPERTY(int heightIncrement READ heightIncrement NOTIFY heightIncrementChanged)
+
 public:
     /// @cond
     MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
@@ -100,6 +136,13 @@
 
     virtual Mir::OrientationAngle orientationAngle() const = 0;
     virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;
+
+    virtual int minimumWidth() const = 0;
+    virtual int minimumHeight() const = 0;
+    virtual int maximumWidth() const = 0;
+    virtual int maximumHeight() const = 0;
+    virtual int widthIncrement() const = 0;
+    virtual int heightIncrement() const = 0;
     /// @endcond
 
 Q_SIGNALS:
@@ -111,6 +154,12 @@
     void orientationAngleChanged(Mir::OrientationAngle value);
     void sizeChanged(const QSize &value);
     void nameChanged(const QString &name);
+    void minimumWidthChanged(int value);
+    void minimumHeightChanged(int value);
+    void maximumWidthChanged(int value);
+    void maximumHeightChanged(int value);
+    void widthIncrementChanged(int value);
+    void heightIncrementChanged(int value);
     /// @endcond
 };