Unity API

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

  1. surfaceItemSizeHints
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Michał Sawicz
Approved revision: 208
Merged at revision: 208
Proposed branch: lp:~unity-team/unity-api/surfaceItemSizeHints
Merge into: lp:unity-api
Prerequisite: lp:~dandrader/unity-api/initialSurfaceGeom
Diff against target: 72 lines (+49/-0)
1 file modified
include/unity/shell/application/MirSurfaceInterface.h (+49/-0)
To merge this branch: bzr merge lp:~unity-team/unity-api/surfaceItemSizeHints
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity8 CI Bot continuous-integration Approve
Lukáš Tinkl Pending
Review via email: mp+284890@code.launchpad.net

This proposal supersedes a proposal from 2016-02-03.

Commit message

MirSurfaceInterface: added size hints

Description of the change

MirSurfaceInterface: added size hints

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote : Posted in a previous version of this proposal

LGTM, approving

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote : Posted in a previous version of this proposal

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)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/unity-api-ci/385/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/73/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/74
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/74/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/73/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/84/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/84
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/84/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/84/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Approving as per superseded MP.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
2--- include/unity/shell/application/MirSurfaceInterface.h 2015-10-26 18:26:01 +0000
3+++ include/unity/shell/application/MirSurfaceInterface.h 2016-02-03 11:32:56 +0000
4@@ -78,6 +78,42 @@
5 Q_PROPERTY(Mir::OrientationAngle orientationAngle READ orientationAngle WRITE setOrientationAngle
6 NOTIFY orientationAngleChanged DESIGNABLE false)
7
8+ /**
9+ * @brief The requested minimum width for the surface
10+ * Zero if not set
11+ */
12+ Q_PROPERTY(int minimumWidth READ minimumWidth NOTIFY minimumWidthChanged)
13+
14+ /**
15+ * @brief The requested minimum height for the surface
16+ * Zero if not set
17+ */
18+ Q_PROPERTY(int minimumHeight READ minimumHeight NOTIFY minimumHeightChanged)
19+
20+ /**
21+ * @brief The requested maximum width for the surface
22+ * Zero if not set
23+ */
24+ Q_PROPERTY(int maximumWidth READ maximumWidth NOTIFY maximumWidthChanged)
25+
26+ /**
27+ * @brief The requested maximum height for the surface
28+ * Zero if not set
29+ */
30+ Q_PROPERTY(int maximumHeight READ maximumHeight NOTIFY maximumHeightChanged)
31+
32+ /**
33+ * @brief The requested width increment for the surface
34+ * Zero if not set
35+ */
36+ Q_PROPERTY(int widthIncrement READ widthIncrement NOTIFY widthIncrementChanged)
37+
38+ /**
39+ * @brief The requested height increment for the surface
40+ * Zero if not set
41+ */
42+ Q_PROPERTY(int heightIncrement READ heightIncrement NOTIFY heightIncrementChanged)
43+
44 public:
45 /// @cond
46 MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
47@@ -100,6 +136,13 @@
48
49 virtual Mir::OrientationAngle orientationAngle() const = 0;
50 virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;
51+
52+ virtual int minimumWidth() const = 0;
53+ virtual int minimumHeight() const = 0;
54+ virtual int maximumWidth() const = 0;
55+ virtual int maximumHeight() const = 0;
56+ virtual int widthIncrement() const = 0;
57+ virtual int heightIncrement() const = 0;
58 /// @endcond
59
60 Q_SIGNALS:
61@@ -111,6 +154,12 @@
62 void orientationAngleChanged(Mir::OrientationAngle value);
63 void sizeChanged(const QSize &value);
64 void nameChanged(const QString &name);
65+ void minimumWidthChanged(int value);
66+ void minimumHeightChanged(int value);
67+ void maximumWidthChanged(int value);
68+ void maximumHeightChanged(int value);
69+ void widthIncrementChanged(int value);
70+ void heightIncrementChanged(int value);
71 /// @endcond
72 };
73

Subscribers

People subscribed via source and target branches

to all changes: