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

[Michał Sawicz]

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

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:205
http://jenkins.qa.ubuntu.com/job/unity-api-ci/384/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/73
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/73/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/72
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/83
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/83
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/83/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/83

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:205
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/14/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-1-ci/14/rebuild

review: Approve (continuous-integration)

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

208. By Daniel d'Andrada on 2016-02-03

MirSurfaceInterface: added size hints

Unmerged revisions

=== modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
--- include/unity/shell/application/ApplicationInfoInterface.h	2015-12-03 19:03:29 +0000
+++ include/unity/shell/application/ApplicationInfoInterface.h	2016-02-03 11:32:37 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013,2015 Canonical Ltd.
+ * Copyright 2013,2015,2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
 #include <QColor>
+#include <QSize>
 
 namespace unity
 {
@@ -211,6 +212,11 @@
      */
     Q_PROPERTY(bool exemptFromLifecycle READ exemptFromLifecycle WRITE setExemptFromLifecycle NOTIFY exemptFromLifecycleChanged)
 
+    /**
+     * @brief The size to be given for new surfaces created by this application
+     */
+    Q_PROPERTY(QSize initialSurfaceSize READ initialSurfaceSize WRITE setInitialSurfaceSize NOTIFY initialSurfaceSizeChanged)
+
 protected:
     /// @cond
     ApplicationInfoInterface(const QString &appId, QObject* parent = 0): QObject(parent) { Q_UNUSED(appId) }
@@ -284,6 +290,8 @@
     virtual bool isTouchApp() const = 0;
     virtual bool exemptFromLifecycle() const = 0;
     virtual void setExemptFromLifecycle(bool) = 0;
+    virtual QSize initialSurfaceSize() const = 0;
+    virtual void setInitialSurfaceSize(const QSize &size) = 0;
     /// @endcond
 
 Q_SIGNALS:
@@ -296,6 +304,7 @@
     void requestedStateChanged(RequestedState value);
     void focusedChanged(bool focused);
     void exemptFromLifecycleChanged(bool exemptFromLifecycle);
+    void initialSurfaceSizeChanged(const QSize &size);
     /// @endcond
 };
 

=== 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	2016-02-03 11:32:37 +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
 };
 

=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2015-12-03 17:07:15 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-02-03 11:32:37 +0000
@@ -59,6 +59,9 @@
     bool exemptFromLifecycle() const override;
     void setExemptFromLifecycle(bool exemptFromLifecycle) override;
 
+    QSize initialSurfaceSize() const override { return QSize(); }
+    void setInitialSurfaceSize(const QSize &) override {}
+
 private:
     QString m_appId;
     QString m_name;