Merge lp:~dandrader/unity-api/cursorConfinement into lp:unity-api

Proposed by Daniel d'Andrada
Status: Merged
Approved by: Lukáš Tinkl
Approved revision: no longer in the source branch.
Merged at revision: 252
Proposed branch: lp:~dandrader/unity-api/cursorConfinement
Merge into: lp:unity-api
Diff against target: 61 lines (+17/-1)
3 files modified
debian/changelog (+6/-0)
include/unity/shell/application/CMakeLists.txt (+1/-1)
include/unity/shell/application/MirSurfaceInterface.h (+10/-0)
To merge this branch: bzr merge lp:~dandrader/unity-api/cursorConfinement
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Lukáš Tinkl (community) Approve
Review via email: mp+303984@code.launchpad.net

Commit message

Added MirSurfaceInterface::confinesMousePointer

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

LGTM, looks good to me

review: Approve
250. By CI Train Bot Account

Added persistent Id property for MirSurface

251. By CI Train Bot Account

Releasing 7.118+16.10.20160830-0ubuntu1

252. By Daniel d'Andrada

Added MirSurfaceInterface::confinesMousePointer

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :
review: Needs Fixing (continuous-integration)

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-08-30 13:40:31 +0000
3+++ debian/changelog 2016-09-05 13:21:57 +0000
4@@ -1,3 +1,9 @@
5+unity-api (7.119) UNRELEASED; urgency=medium
6+
7+ * Added MirSurfaceInterface::confinesMousePointer
8+
9+ -- Daniel d'Andrada <daniel.dandrada@canonical.com> Mon, 27 Jun 2016 11:32:43 -0300
10+
11 unity-api (7.118+16.10.20160830-0ubuntu1) yakkety; urgency=medium
12
13 [ Nick Dedekind ]
14
15=== modified file 'include/unity/shell/application/CMakeLists.txt'
16--- include/unity/shell/application/CMakeLists.txt 2016-08-22 12:49:02 +0000
17+++ include/unity/shell/application/CMakeLists.txt 2016-09-05 13:21:57 +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 21)
23+set(VERSION 22)
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-08-22 12:49:02 +0000
30+++ include/unity/shell/application/MirSurfaceInterface.h 2016-09-05 13:21:57 +0000
31@@ -147,6 +147,13 @@
32 */
33 Q_PROPERTY(QRect inputBounds READ inputBounds NOTIFY inputBoundsChanged)
34
35+ /**
36+ * @brief Whether the surface wants to confine the mouse pointer within its boundaries
37+ *
38+ * If true, the surface doesn't want the mouse pointer to leave its boundaries while it's focused.
39+ */
40+ Q_PROPERTY(bool confinesMousePointer READ confinesMousePointer NOTIFY confinesMousePointerChanged)
41+
42 public:
43 /// @cond
44 MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
45@@ -187,6 +194,8 @@
46 virtual bool focused() const = 0;
47
48 virtual QRect inputBounds() const = 0;
49+
50+ virtual bool confinesMousePointer() const = 0;
51 /// @endcond
52
53 /**
54@@ -226,6 +235,7 @@
55 void keymapChanged(const QString &value);
56 void focusedChanged(bool value);
57 void inputBoundsChanged(QRect value);
58+ void confinesMousePointerChanged(bool value);
59 /// @endcond
60
61 /**

Subscribers

People subscribed via source and target branches

to all changes: