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

Proposed by Nick Dedekind on 2015-10-27
Status: Merged
Approved by: Michał Sawicz on 2015-11-05
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 2015-10-27 Approve on 2015-11-05
PS Jenkins bot (community) continuous-integration 2015-10-27 Approve on 2015-10-27
Daniel d'Andrada 2015-10-27 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.
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
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.

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
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
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
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-10-27 16:33:08 +0000
3+++ debian/changelog 2015-10-27 16:33:09 +0000
4@@ -1,8 +1,12 @@
5 unity-api (7.102) UNRELEASED; urgency=medium
6
7+ [ Nick Dedekind ]
8+ * Added visibility to surface interface.
9+
10+ [ Michael Terry ]
11 * Add isTouchApp to ApplicationInfoInterface
12
13- -- Michael Terry <mterry@ubuntu.com> Tue, 29 Sep 2015 13:36:51 -0400
14+ -- Nick Dedekind <nick.dedekind@canonical.com> Tue, 22 Sep 2015 14:43:33 +0100
15
16 unity-api (7.101+15.10.20151021-0ubuntu1) wily; urgency=medium
17
18
19=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
20--- include/unity/shell/application/MirSurfaceInterface.h 2015-09-29 11:34:31 +0000
21+++ include/unity/shell/application/MirSurfaceInterface.h 2015-10-27 16:33:09 +0000
22@@ -66,6 +66,11 @@
23 Q_PROPERTY(bool live READ live NOTIFY liveChanged)
24
25 /**
26+ * @brief Visibility of the surface
27+ */
28+ Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
29+
30+ /**
31 * @brief Orientation angle of the surface
32 *
33 * How many degrees, clockwise, the UI in the surface has to rotate to match shell's UI orientation
34@@ -91,6 +96,8 @@
35
36 virtual bool live() const = 0;
37
38+ virtual bool visible() const = 0;
39+
40 virtual Mir::OrientationAngle orientationAngle() const = 0;
41 virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;
42 /// @endcond
43@@ -99,6 +106,7 @@
44 /// @cond
45 void typeChanged(Mir::Type value);
46 void liveChanged(bool value);
47+ void visibleChanged(bool visible);
48 void stateChanged(Mir::State value);
49 void orientationAngleChanged(Mir::OrientationAngle value);
50 void sizeChanged(const QSize &value);

Subscribers

People subscribed via source and target branches

to all changes: