Unity API

Merge lp:~ci-train-bot/unity-api/unity-api-ubuntu-yakkety-landing-076 into lp:unity-api

  1. unity-api-ubuntu-yakkety-landing-076
  2. Merge into trunk
Proposed by Michael Terry
Status: Merged
Merged at revision: 240
Proposed branch: lp:~ci-train-bot/unity-api/unity-api-ubuntu-yakkety-landing-076
Merge into: lp:unity-api
Diff against target: 69 lines (+18/-1)
3 files modified
debian/changelog (+6/-0)
include/unity/shell/application/CMakeLists.txt (+1/-1)
include/unity/shell/application/MirSurfaceInterface.h (+11/-0)
To merge this branch: bzr merge lp:~ci-train-bot/unity-api/unity-api-ubuntu-yakkety-landing-076
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+300098@code.launchpad.net
To post a comment you must log in.

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 2016-06-14 08:34:16 +0000
3+++ debian/changelog 2016-07-14 15:41:51 +0000
4@@ -1,3 +1,9 @@
5+unity-api (7.116+16.10.20160620-0ubuntu1) yakkety; urgency=medium
6+
7+ * MirSurfaceInterface: add inputBounds property
8+
9+ -- Daniel d'Andrada <daniel.dandrada@canonical.com> Mon, 20 Jun 2016 14:39:15 +0000
10+
11 unity-api (7.115+16.10.20160614-0ubuntu1) yakkety; urgency=medium
12
13 [ Michael Zanetti ]
14
15=== modified file 'include/unity/shell/application/CMakeLists.txt'
16--- include/unity/shell/application/CMakeLists.txt 2016-06-03 11:20:04 +0000
17+++ include/unity/shell/application/CMakeLists.txt 2016-07-14 15:41:51 +0000
18@@ -7,7 +7,7 @@
19
20 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
21
22-set(VERSION 18)
23+set(VERSION 19)
24 set(PKGCONFIG_NAME "unity-shell-application")
25 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
26 set(PKGCONFIG_REQUIRES "Qt5Core")
27
28=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
29--- include/unity/shell/application/MirSurfaceInterface.h 2016-05-17 12:55:00 +0000
30+++ include/unity/shell/application/MirSurfaceInterface.h 2016-07-14 15:41:51 +0000
31@@ -18,6 +18,7 @@
32 #define UNITY_SHELL_APPLICATION_MIRSURFACE_H
33
34 #include <QObject>
35+#include <QRect>
36 #include <QSize>
37
38 #include "Mir.h"
39@@ -134,6 +135,13 @@
40 */
41 Q_PROPERTY(bool focused READ focused NOTIFY focusedChanged)
42
43+ /**
44+ * @brief Input bounds
45+ *
46+ * Bounding rectangle of the surface region that accepts input.
47+ */
48+ Q_PROPERTY(QRect inputBounds READ inputBounds NOTIFY inputBoundsChanged)
49+
50 public:
51 /// @cond
52 MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
53@@ -170,6 +178,8 @@
54 virtual Mir::ShellChrome shellChrome() const = 0;
55
56 virtual bool focused() const = 0;
57+
58+ virtual QRect inputBounds() const = 0;
59 /// @endcond
60
61 /**
62@@ -208,6 +218,7 @@
63 void shellChromeChanged(Mir::ShellChrome value);
64 void keymapChanged(const QString &value);
65 void focusedChanged(bool value);
66+ void inputBoundsChanged(QRect value);
67 /// @endcond
68
69 /**

Subscribers

People subscribed via source and target branches