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: Superseded
Proposed branch: lp:~nick-dedekind/unity-api/lp1475678.surface-occlude
Merge into: lp:unity-api
Diff against target: 161 lines (+38/-0)
8 files modified
debian/changelog (+10/-0)
include/unity/shell/application/ApplicationInfoInterface.h (+6/-0)
include/unity/shell/application/ApplicationManagerInterface.h (+2/-0)
include/unity/shell/application/MirSurfaceInterface.h (+8/-0)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp (+5/-0)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h (+2/-0)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp (+2/-0)
test/qmltest/unity/shell/application/tst_Application.qml (+3/-0)
To merge this branch: bzr merge lp:~nick-dedekind/unity-api/lp1475678.surface-occlude
Reviewer Review Type Date Requested Status
Michał Sawicz Needs Fixing
Daniel d'Andrada (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+273425@code.launchpad.net

This proposal has been superseded by a proposal from 2015-10-27.

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 :

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 :

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

"""
+ Q_ENUMS(Visibility)
"""

Looks like a leftover from a previous version.

review: Needs Fixing
lp:~nick-dedekind/unity-api/lp1475678.surface-occlude updated
191. By Nick Dedekind

reverted enum

Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> 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 :

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 :

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 :

This needs a version bump in application API CMakeLists.txt

review: Needs Fixing
lp:~nick-dedekind/unity-api/lp1475678.surface-occlude updated
192. By Nick Dedekind

merge with trunk

193. By Nick Dedekind

merged no-touch-no-lifecycle

Unmerged revisions

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-21 11:48:38 +0000
3+++ debian/changelog 2015-10-27 16:32:09 +0000
4@@ -1,3 +1,13 @@
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+ -- Nick Dedekind <nick.dedekind@canonical.com> Tue, 22 Sep 2015 14:43:33 +0100
14+
15 unity-api (7.101+15.10.20151021-0ubuntu1) wily; urgency=medium
16
17 [ Daniel d'Andrada ]
18
19=== modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
20--- include/unity/shell/application/ApplicationInfoInterface.h 2015-06-19 12:02:05 +0000
21+++ include/unity/shell/application/ApplicationInfoInterface.h 2015-10-27 16:32:09 +0000
22@@ -199,6 +199,11 @@
23 */
24 Q_PROPERTY(bool rotatesWindowContents READ rotatesWindowContents CONSTANT)
25
26+ /**
27+ * @brief Whether the application is an app targeting the Ubuntu Touch platform.
28+ */
29+ Q_PROPERTY(bool isTouchApp READ isTouchApp CONSTANT)
30+
31 protected:
32 /// @cond
33 ApplicationInfoInterface(const QString &appId, QObject* parent = 0): QObject(parent) { Q_UNUSED(appId) }
34@@ -269,6 +274,7 @@
35 virtual QColor splashColorFooter() const = 0;
36 virtual Qt::ScreenOrientations supportedOrientations() const = 0;
37 virtual bool rotatesWindowContents() const = 0;
38+ virtual bool isTouchApp() const = 0;
39 /// @endcond
40
41 Q_SIGNALS:
42
43=== modified file 'include/unity/shell/application/ApplicationManagerInterface.h'
44--- include/unity/shell/application/ApplicationManagerInterface.h 2015-06-19 12:02:05 +0000
45+++ include/unity/shell/application/ApplicationManagerInterface.h 2015-10-27 16:32:09 +0000
46@@ -70,6 +70,7 @@
47 m_roleNames.insert(RoleStage, "stage");
48 m_roleNames.insert(RoleState, "state");
49 m_roleNames.insert(RoleFocused, "focused");
50+ m_roleNames.insert(RoleIsTouchApp, "isTouchApp");
51
52 connect(this, SIGNAL(rowsInserted(QModelIndex, int, int)), SIGNAL(countChanged()));
53 connect(this, SIGNAL(rowsRemoved(QModelIndex, int, int)), SIGNAL(countChanged()));
54@@ -92,6 +93,7 @@
55 RoleStage,
56 RoleState,
57 RoleFocused,
58+ RoleIsTouchApp,
59 };
60
61 /// @cond
62
63=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
64--- include/unity/shell/application/MirSurfaceInterface.h 2015-09-29 11:34:31 +0000
65+++ include/unity/shell/application/MirSurfaceInterface.h 2015-10-27 16:32:09 +0000
66@@ -66,6 +66,11 @@
67 Q_PROPERTY(bool live READ live NOTIFY liveChanged)
68
69 /**
70+ * @brief Visibility of the surface
71+ */
72+ Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
73+
74+ /**
75 * @brief Orientation angle of the surface
76 *
77 * How many degrees, clockwise, the UI in the surface has to rotate to match shell's UI orientation
78@@ -91,6 +96,8 @@
79
80 virtual bool live() const = 0;
81
82+ virtual bool visible() const = 0;
83+
84 virtual Mir::OrientationAngle orientationAngle() const = 0;
85 virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;
86 /// @endcond
87@@ -99,6 +106,7 @@
88 /// @cond
89 void typeChanged(Mir::Type value);
90 void liveChanged(bool value);
91+ void visibleChanged(bool visible);
92 void stateChanged(Mir::State value);
93 void orientationAngleChanged(Mir::OrientationAngle value);
94 void sizeChanged(const QSize &value);
95
96=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp'
97--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp 2015-06-19 12:02:05 +0000
98+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.cpp 2015-10-27 16:32:09 +0000
99@@ -144,3 +144,8 @@
100 {
101 return false;
102 }
103+
104+bool MockApplicationInfo::isTouchApp() const
105+{
106+ return true;
107+}
108
109=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
110--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h 2015-06-19 12:02:05 +0000
111+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h 2015-10-27 16:32:09 +0000
112@@ -55,6 +55,8 @@
113 Qt::ScreenOrientations supportedOrientations() const override;
114 bool rotatesWindowContents() const override;
115
116+ bool isTouchApp() const override;
117+
118 private:
119 QString m_appId;
120 QString m_name;
121
122=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp'
123--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp 2015-06-19 12:02:05 +0000
124+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationManager.cpp 2015-10-27 16:32:09 +0000
125@@ -66,6 +66,8 @@
126 return item->state();
127 case RoleFocused:
128 return item->focused();
129+ case RoleIsTouchApp:
130+ return item->isTouchApp();
131 }
132
133 return QVariant();
134
135=== modified file 'test/qmltest/unity/shell/application/tst_Application.qml'
136--- test/qmltest/unity/shell/application/tst_Application.qml 2015-06-19 12:02:05 +0000
137+++ test/qmltest/unity/shell/application/tst_Application.qml 2015-10-27 16:32:09 +0000
138@@ -69,6 +69,7 @@
139 { enum: "RoleStage" },
140 { enum: "RoleState" },
141 { enum: "RoleFocused" },
142+ { enum: "RoleIsTouchApp" },
143 ];
144 }
145
146@@ -88,6 +89,7 @@
147 { tag: "ApplicationManager.roles[stage]", role: "stage", type: "number" },
148 { tag: "ApplicationManager.roles[state]", role: "state", type: "number" },
149 { tag: "ApplicationManager.roles[focused]", role: "focused", type: "boolean" },
150+ { tag: "ApplicationManager.roles[isTouchApp]", role: "isTouchApp", type: "boolean" },
151 ];
152 }
153
154@@ -143,6 +145,7 @@
155 { tag: "ApplicationInfo.properties[state]", property: "state", type: "number" },
156 { tag: "ApplicationInfo.properties[requestedState]", property: "requestedState", type: "number" },
157 { tag: "ApplicationInfo.properties[focused]", property: "focused", type: "boolean" },
158+ { tag: "ApplicationInfo.properties[isTouchApp]", constant: "isTouchApp", type: "boolean" },
159 { tag: "ApplicationInfo.properties[splashTitle]", constant: "splashTitle", type: "string" },
160 { tag: "ApplicationInfo.properties[splashImage]", constant: "splashImage", type: "url" },
161 { tag: "ApplicationInfo.properties[splashShowHeader]", constant: "splashShowHeader", type: "boolean"},

Subscribers

People subscribed via source and target branches

to all changes: