Unity API

Merge lp:~nick-dedekind/unity-api/lp1475678.surface-occlude into lp:unity-api

  1. lp1475678.surface-occlude
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Michał Sawicz
Approved revision: 193
Merged at revision: 193
Proposed branch: lp:~nick-dedekind/unity-api/lp1475678.surface-occlude
Merge into: lp:unity-api
Prerequisite: lp:~mterry/unity-api/no-touch-no-lifecycle
Diff against target: 50 lines (+13/-1)
2 files modified
debian/changelog (+5/-1)
include/unity/shell/application/MirSurfaceInterface.h (+8/-0)
To merge this branch: bzr merge lp:~nick-dedekind/unity-api/lp1475678.surface-occlude
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Daniel d'Andrada Pending
Review via email: mp+275884@code.launchpad.net

This proposal supersedes a proposal from 2015-10-05.

Commit message

Support server->client visibility change to stop rendering (lp:#1475678)

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

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

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

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

In include/unity/shell/application/Mir.h:

"""
+ Q_ENUMS(Visibility)
"""

Looks like a leftover from a previous version.

review: Needs Fixing
Revision history for this message
Nick Dedekind (nick-dedekind) wrote : Posted in a previous version of this proposal

> In include/unity/shell/application/Mir.h:
>
> """
> + Q_ENUMS(Visibility)
> """
>
> Looks like a leftover from a previous version.

Removed.

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

PASSED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/unity-api-ci/349/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-amd64-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/38
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-armhf-ci/38/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-vivid-i386-ci/37
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-amd64-ci/48
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/48
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-wily-armhf-ci/48/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-wily-i386-ci/48

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

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote : Posted in a previous version of this proposal

Code looks ok.

Will have to bump "set(VERSION 8)" in include/unity/shell/application/CMakeLists.txt before merging. No point in doing so now as that's being changed already by MPs on the queue for landing.

review: Approve
Revision history for this message
Michał Sawicz (saviq) wrote : Posted in a previous version of this proposal

This needs a version bump in application API CMakeLists.txt

review: Needs Fixing
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

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

Approving as per superseded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2015-10-27 16:33:08 +0000
+++ debian/changelog 2015-10-27 16:33:09 +0000
@@ -1,8 +1,12 @@
1unity-api (7.102) UNRELEASED; urgency=medium1unity-api (7.102) UNRELEASED; urgency=medium
22
3 [ Nick Dedekind ]
4 * Added visibility to surface interface.
5
6 [ Michael Terry ]
3 * Add isTouchApp to ApplicationInfoInterface7 * Add isTouchApp to ApplicationInfoInterface
48
5 -- Michael Terry <mterry@ubuntu.com> Tue, 29 Sep 2015 13:36:51 -04009 -- Nick Dedekind <nick.dedekind@canonical.com> Tue, 22 Sep 2015 14:43:33 +0100
610
7unity-api (7.101+15.10.20151021-0ubuntu1) wily; urgency=medium11unity-api (7.101+15.10.20151021-0ubuntu1) wily; urgency=medium
812
913
=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
--- include/unity/shell/application/MirSurfaceInterface.h 2015-09-29 11:34:31 +0000
+++ include/unity/shell/application/MirSurfaceInterface.h 2015-10-27 16:33:09 +0000
@@ -66,6 +66,11 @@
66 Q_PROPERTY(bool live READ live NOTIFY liveChanged)66 Q_PROPERTY(bool live READ live NOTIFY liveChanged)
6767
68 /**68 /**
69 * @brief Visibility of the surface
70 */
71 Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
72
73 /**
69 * @brief Orientation angle of the surface74 * @brief Orientation angle of the surface
70 *75 *
71 * How many degrees, clockwise, the UI in the surface has to rotate to match shell's UI orientation76 * How many degrees, clockwise, the UI in the surface has to rotate to match shell's UI orientation
@@ -91,6 +96,8 @@
9196
92 virtual bool live() const = 0;97 virtual bool live() const = 0;
9398
99 virtual bool visible() const = 0;
100
94 virtual Mir::OrientationAngle orientationAngle() const = 0;101 virtual Mir::OrientationAngle orientationAngle() const = 0;
95 virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;102 virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;
96 /// @endcond103 /// @endcond
@@ -99,6 +106,7 @@
99 /// @cond106 /// @cond
100 void typeChanged(Mir::Type value);107 void typeChanged(Mir::Type value);
101 void liveChanged(bool value);108 void liveChanged(bool value);
109 void visibleChanged(bool visible);
102 void stateChanged(Mir::State value);110 void stateChanged(Mir::State value);
103 void orientationAngleChanged(Mir::OrientationAngle value);111 void orientationAngleChanged(Mir::OrientationAngle value);
104 void sizeChanged(const QSize &value);112 void sizeChanged(const QSize &value);

Subscribers

People subscribed via source and target branches

to all changes: