1
=== modified file 'debian/changelog'
2
--- debian/changelog	2015-12-07 16:21:29 +0000
3
+++ debian/changelog	2015-12-14 10:04:26 +0000
4
@@ -1,3 +1,9 @@
5
1
unity-api (7.105) UNRELEASED; urgency=medium
6
2
7
3
  * MirSurfaceInterface: added size hints
8
4
9
5
 -- Daniel d'Andrada <daniel.dandrada@canonical.com>  Mon, 14 Dec 2015 07:53:47 -0200
10
6
11
1
unity-api (7.104+16.04.20151207-0ubuntu1) xenial; urgency=medium
7
unity-api (7.104+16.04.20151207-0ubuntu1) xenial; urgency=medium
12
2
8
13
3
  [ Daniel d'Andrada ]
9
  [ Daniel d'Andrada ]
14
4
10
15
=== modified file 'include/unity/shell/application/CMakeLists.txt'
16
--- include/unity/shell/application/CMakeLists.txt	2015-12-03 19:32:37 +0000
17
+++ include/unity/shell/application/CMakeLists.txt	2015-12-14 10:04:26 +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 12)
10
set(VERSION 13)
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	2015-10-26 18:26:01 +0000
30
+++ include/unity/shell/application/MirSurfaceInterface.h	2015-12-14 10:04:26 +0000
31
@@ -78,6 +78,42 @@
32
78
    Q_PROPERTY(Mir::OrientationAngle orientationAngle READ orientationAngle WRITE setOrientationAngle
78
    Q_PROPERTY(Mir::OrientationAngle orientationAngle READ orientationAngle WRITE setOrientationAngle
33
79
               NOTIFY orientationAngleChanged DESIGNABLE false)
79
               NOTIFY orientationAngleChanged DESIGNABLE false)
34
80
80
35
81
    /**
36
82
     * @brief The requested minimum width for the surface
37
83
     * Zero if not set
38
84
     */
39
85
    Q_PROPERTY(int minimumWidth READ minimumWidth NOTIFY minimumWidthChanged)
40
86
41
87
    /**
42
88
     * @brief The requested minimum height for the surface
43
89
     * Zero if not set
44
90
     */
45
91
    Q_PROPERTY(int minimumHeight READ minimumHeight NOTIFY minimumHeightChanged)
46
92
47
93
    /**
48
94
     * @brief The requested maximum width for the surface
49
95
     * Zero if not set
50
96
     */
51
97
    Q_PROPERTY(int maximumWidth READ maximumWidth NOTIFY maximumWidthChanged)
52
98
53
99
    /**
54
100
     * @brief The requested maximum height for the surface
55
101
     * Zero if not set
56
102
     */
57
103
    Q_PROPERTY(int maximumHeight READ maximumHeight NOTIFY maximumHeightChanged)
58
104
59
105
    /**
60
106
     * @brief The requested width increment for the surface
61
107
     * Zero if not set
62
108
     */
63
109
    Q_PROPERTY(int widthIncrement READ widthIncrement NOTIFY widthIncrementChanged)
64
110
65
111
    /**
66
112
     * @brief The requested height increment for the surface
67
113
     * Zero if not set
68
114
     */
69
115
    Q_PROPERTY(int heightIncrement READ heightIncrement NOTIFY heightIncrementChanged)
70
116
71
81
public:
117
public:
72
82
    /// @cond
118
    /// @cond
73
83
    MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
119
    MirSurfaceInterface(QObject *parent = nullptr) : QObject(parent) {}
74
@@ -100,6 +136,13 @@
75
100
136
76
101
    virtual Mir::OrientationAngle orientationAngle() const = 0;
137
    virtual Mir::OrientationAngle orientationAngle() const = 0;
77
102
    virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;
138
    virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;
78
139
79
140
    virtual int minimumWidth() const = 0;
80
141
    virtual int minimumHeight() const = 0;
81
142
    virtual int maximumWidth() const = 0;
82
143
    virtual int maximumHeight() const = 0;
83
144
    virtual int widthIncrement() const = 0;
84
145
    virtual int heightIncrement() const = 0;
85
103
    /// @endcond
146
    /// @endcond
86
104
147
87
105
Q_SIGNALS:
148
Q_SIGNALS:
88
@@ -111,6 +154,12 @@
89
111
    void orientationAngleChanged(Mir::OrientationAngle value);
154
    void orientationAngleChanged(Mir::OrientationAngle value);
90
112
    void sizeChanged(const QSize &value);
155
    void sizeChanged(const QSize &value);
91
113
    void nameChanged(const QString &name);
156
    void nameChanged(const QString &name);
92
157
    void minimumWidthChanged(int value);
93
158
    void minimumHeightChanged(int value);
94
159
    void maximumWidthChanged(int value);
95
160
    void maximumHeightChanged(int value);
96
161
    void widthIncrementChanged(int value);
97
162
    void heightIncrementChanged(int value);
98
114
    /// @endcond
163
    /// @endcond
99
115
};
164
};
100
116
165
Reviewer	Review Type	Date Requested	Status
Lukáš Tinkl (community)		2015-11-26	Approve on 2015-12-01
PS Jenkins bot (community)	continuous-integration		Approve on 2015-11-30
Review via email: mp+278740@code.launchpad.net