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

Proposed by Daniel d'Andrada
Status: Superseded
Proposed branch: lp:~dandrader/unity-api/surfaceAllowClientResize
Merge into: lp:unity-api
Diff against target: 137 lines (+32/-4)
7 files modified
debian/changelog (+10/-0)
include/unity/shell/application/CMakeLists.txt (+1/-1)
include/unity/shell/application/MirSurfaceInterface.h (+11/-0)
include/unity/shell/launcher/CMakeLists.txt (+1/-1)
include/unity/shell/launcher/QuickListModelInterface.h (+5/-1)
test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp (+2/-0)
test/qmltest/unity/shell/launcher/tst_Launcher.qml (+2/-1)
To merge this branch: bzr merge lp:~dandrader/unity-api/surfaceAllowClientResize
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+319208@code.launchpad.net

This proposal has been superseded by a proposal from 2017-03-13.

Commit message

MirSurfaceInterface::allowClientResize - specify if client can resize its windows

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:276
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/149/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4343
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4371
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4205
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4205/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4205
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4205/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4205
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4205/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4205
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4205/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4205
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4205/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4205
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4205/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity-api-ci/149/rebuild

review: Approve (continuous-integration)
Revision history for this message
Gerry Boland (gerboland) :
review: Approve
276. By Daniel d'Andrada

merge lp:~mzanetti/unity-api/private-quicklist-entries

277. By Daniel d'Andrada

MirSurfaceInterface::allowClientResize

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 2017-02-23 11:22:38 +0000
3+++ debian/changelog 2017-03-13 17:54:33 +0000
4@@ -1,3 +1,13 @@
5+unity-api (8.5) UNRELEASED; urgency=medium
6+
7+ [ Michael Zanetti ]
8+ * Add RoleIsPrivate to launcher's quicklist entries
9+
10+ [ Daniel d'Andrada ]
11+ * MirSurfaceInterface::allowClientResize
12+
13+ -- Michael Zanetti <michael.zanetti@canonical.com> Fri, 24 Feb 2017 13:57:12 +0000
14+
15 unity-api (8.4+17.04.20170223-0ubuntu1) zesty; urgency=medium
16
17 [ Pete Woods ]
18
19=== modified file 'include/unity/shell/application/CMakeLists.txt'
20--- include/unity/shell/application/CMakeLists.txt 2017-01-26 11:07:35 +0000
21+++ include/unity/shell/application/CMakeLists.txt 2017-03-13 17:54:33 +0000
22@@ -7,7 +7,7 @@
23
24 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
25
26-set(VERSION 26)
27+set(VERSION 27)
28 set(PKGCONFIG_NAME "unity-shell-application")
29 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
30 set(PKGCONFIG_REQUIRES "Qt5Core")
31
32=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
33--- include/unity/shell/application/MirSurfaceInterface.h 2017-01-26 11:07:35 +0000
34+++ include/unity/shell/application/MirSurfaceInterface.h 2017-03-13 17:54:33 +0000
35@@ -165,6 +165,13 @@
36 Q_PROPERTY(bool confinesMousePointer READ confinesMousePointer NOTIFY confinesMousePointerChanged)
37
38 /**
39+ * @brief Whether to comply to resize requests coming from the client side
40+ *
41+ * It's true by default
42+ */
43+ Q_PROPERTY(bool allowClientResize READ allowClientResize WRITE setAllowClientResize NOTIFY allowClientResizeChanged)
44+
45+ /**
46 * @brief The parent MirSurface or null if this is a top-level surface
47 */
48 Q_PROPERTY(MirSurfaceInterface* parentSurface READ parentSurface CONSTANT)
49@@ -221,6 +228,9 @@
50
51 virtual bool confinesMousePointer() const = 0;
52
53+ virtual bool allowClientResize() const = 0;
54+ virtual void setAllowClientResize(bool) = 0;
55+
56 virtual QPoint requestedPosition() const = 0;
57 virtual void setRequestedPosition(const QPoint &) = 0;
58
59@@ -270,6 +280,7 @@
60 void focusedChanged(bool value);
61 void inputBoundsChanged(QRect value);
62 void confinesMousePointerChanged(bool value);
63+ void allowClientResizeChanged(bool value);
64 /// @endcond
65
66 /**
67
68=== modified file 'include/unity/shell/launcher/CMakeLists.txt'
69--- include/unity/shell/launcher/CMakeLists.txt 2016-11-30 10:43:52 +0000
70+++ include/unity/shell/launcher/CMakeLists.txt 2017-03-13 17:54:33 +0000
71@@ -7,7 +7,7 @@
72
73 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
74
75-set(VERSION 11)
76+set(VERSION 12)
77 set(PKGCONFIG_NAME "unity-shell-launcher")
78 set(PKGCONFIG_DESCRIPTION "Unity shell Launcher APIs")
79 set(PKGCONFIG_REQUIRES "Qt5Core")
80
81=== modified file 'include/unity/shell/launcher/QuickListModelInterface.h'
82--- include/unity/shell/launcher/QuickListModelInterface.h 2016-12-14 15:57:28 +0000
83+++ include/unity/shell/launcher/QuickListModelInterface.h 2017-03-13 17:54:33 +0000
84@@ -39,6 +39,7 @@
85 * - RoleIcon (icon): The icon to be shown for this entry (QString).
86 * - RoleClickable (clickable): Determines if the entry can be triggered or is just a static text (boolean)
87 * - RoleHasSeparator (hasSeparator): Determines if the entry has a separator (boolean)
88+ * - RoleIsPrivate (isPrivate): Determines whether the entry should be shown or not in locked mode (e.g. greeter is locked)
89 */
90 class UNITY_API QuickListModelInterface: public QAbstractListModel
91 {
92@@ -51,6 +52,7 @@
93 m_roleNames.insert(RoleIcon, "icon");
94 m_roleNames.insert(RoleClickable, "clickable");
95 m_roleNames.insert(RoleHasSeparator, "hasSeparator");
96+ m_roleNames.insert(RoleIsPrivate, "isPrivate");
97 }
98 /// @endcond
99 public:
100@@ -63,8 +65,10 @@
101 RoleLabel,
102 RoleIcon,
103 RoleClickable,
104- RoleHasSeparator
105+ RoleHasSeparator,
106+ RoleIsPrivate
107 };
108+ Q_ENUM(Roles)
109
110 /// @cond
111 virtual ~QuickListModelInterface() {}
112
113=== modified file 'test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp'
114--- test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp 2016-10-28 11:14:37 +0000
115+++ test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockQuickListModel.cpp 2017-03-13 17:54:33 +0000
116@@ -39,6 +39,8 @@
117 return true;
118 case RoleHasSeparator:
119 return true;
120+ case RoleIsPrivate:
121+ return false;
122 }
123 return QVariant();
124 }
125
126=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
127--- test/qmltest/unity/shell/launcher/tst_Launcher.qml 2016-11-30 10:38:23 +0000
128+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml 2017-03-13 17:54:33 +0000
129@@ -175,7 +175,8 @@
130 { tag: "Model.roles[label]", role: "label", type: "string" },
131 { tag: "Model.roles[icon]", role: "icon", type: "string" },
132 { tag: "Model.roles[clickable]", role: "clickable", type: "boolean" },
133- { tag: "Model.roles[hasSeparator]", role: "hasSeparator", type: "boolean" }
134+ { tag: "Model.roles[hasSeparator]", role: "hasSeparator", type: "boolean" },
135+ { tag: "Model.roles[isPrivate]", role: "isPrivate", type: "boolean" }
136 ];
137 }
138

Subscribers

People subscribed via source and target branches

to all changes: