1
=== modified file 'debian/changelog'
2
--- debian/changelog	2016-06-14 08:34:16 +0000
3
+++ debian/changelog	2016-06-20 14:06:35 +0000
4
@@ -1,3 +1,9 @@
5
1
unity-api (7.116) UNRELEASED; urgency=medium
6
2
7
3
  * MirSurfaceInterface: add inputBounds property
8
4
9
5
 -- Daniel d'Andrada <daniel.dandrada@canonical.com>  Mon, 20 Jun 2016 11:04:39 -0300
10
6
11
1
unity-api (7.115+16.10.20160614-0ubuntu1) yakkety; urgency=medium
7
unity-api (7.115+16.10.20160614-0ubuntu1) yakkety; urgency=medium
12
2
8
13
3
  [ Michael Zanetti ]
9
  [ Michael Zanetti ]
14
4
10
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-06-20 14:06:35 +0000
18
@@ -7,7 +7,7 @@
19
7
7
20
8
set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
8
set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
21
9
9
23
10
set(VERSION 18)
10
set(VERSION 19)
24
11
set(PKGCONFIG_NAME "unity-shell-application")
11
set(PKGCONFIG_NAME "unity-shell-application")
25
12
set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
12
set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
26
13
set(PKGCONFIG_REQUIRES "Qt5Core")
13
set(PKGCONFIG_REQUIRES "Qt5Core")
27
14
14
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-06-20 14:06:35 +0000
31
@@ -18,6 +18,7 @@
32
18
#define UNITY_SHELL_APPLICATION_MIRSURFACE_H
18
#define UNITY_SHELL_APPLICATION_MIRSURFACE_H
33
19
19
34
20
#include <QObject>
20
#include <QObject>
35
21
#include <QRect>
36
21
#include <QSize>
22
#include <QSize>
37
22
23
38
23
#include "Mir.h"
24
#include "Mir.h"
39
@@ -134,6 +135,13 @@
40
134
     */
135
     */
41
135
    Q_PROPERTY(bool focused READ focused NOTIFY focusedChanged)
136
    Q_PROPERTY(bool focused READ focused NOTIFY focusedChanged)
42
136
137
43
138
    /**
44
139
     * @brief Input bounds
45
140
     *
46
141
     * Bounding rectangle of the surface region that accepts input.
47
142
     */
48
143
    Q_PROPERTY(QRect inputBounds READ inputBounds NOTIFY inputBoundsChanged)
49
144
50
137
public:
145
public:
51
138
    /// @cond
146
    /// @cond
52
139
    MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
147
    MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
53
@@ -170,6 +178,8 @@
54
170
    virtual Mir::ShellChrome shellChrome() const = 0;
178
    virtual Mir::ShellChrome shellChrome() const = 0;
55
171
179
56
172
    virtual bool focused() const = 0;
180
    virtual bool focused() const = 0;
57
181
58
182
    virtual QRect inputBounds() const = 0;
59
173
    /// @endcond
183
    /// @endcond
60
174
184
61
175
    /**
185
    /**
62
@@ -208,6 +218,7 @@
63
208
    void shellChromeChanged(Mir::ShellChrome value);
218
    void shellChromeChanged(Mir::ShellChrome value);
64
209
    void keymapChanged(const QString &value);
219
    void keymapChanged(const QString &value);
65
210
    void focusedChanged(bool value);
220
    void focusedChanged(bool value);
66
221
    void inputBoundsChanged(QRect value);
67
211
    /// @endcond
222
    /// @endcond
68
212
223
69
213
    /**
224
    /**
Status:	Merged
Approved by:	Gerry Boland on 2016-06-20
Approved revision:	239
Merged at revision:	239
Proposed branch:	lp:~dandrader/unity-api/mirSurfaceInputBounds
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:~dandrader/unity-api/mirSurfaceInputBounds
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Approve on 2016-06-20
Gerry Boland (community)			Approve on 2016-06-20
Michał Sawicz		2016-06-09	Needs Fixing on 2016-06-18
Review via email: mp+296985@code.launchpad.net