Unity API

Merge lp:~unity-team/unity-api/initialSurfaceGeom into lp:unity-api

  1. initialSurfaceGeom
  2. Merge into trunk
Proposed by Michał Sawicz
Status: Work in progress
Proposed branch: lp:~unity-team/unity-api/initialSurfaceGeom
Merge into: lp:unity-api
Diff against target: 74 lines (+14/-2)
3 files modified
include/unity/shell/application/ApplicationInfoInterface.h (+10/-1)
include/unity/shell/application/CMakeLists.txt (+1/-1)
test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h (+3/-0)
To merge this branch: bzr merge lp:~unity-team/unity-api/initialSurfaceGeom
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+284763@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

207. By Daniel d'Andrada

Added ApplicationInfoInterface.initialSurfaceSize

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
2--- include/unity/shell/application/ApplicationInfoInterface.h 2015-12-03 19:03:29 +0000
3+++ include/unity/shell/application/ApplicationInfoInterface.h 2016-02-02 17:01:15 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright 2013,2015 Canonical Ltd.
7+ * Copyright 2013,2015,2016 Canonical Ltd.
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU Lesser General Public License as published by
11@@ -22,6 +22,7 @@
12 #include <QtCore/QObject>
13 #include <QtCore/QUrl>
14 #include <QColor>
15+#include <QSize>
16
17 namespace unity
18 {
19@@ -211,6 +212,11 @@
20 */
21 Q_PROPERTY(bool exemptFromLifecycle READ exemptFromLifecycle WRITE setExemptFromLifecycle NOTIFY exemptFromLifecycleChanged)
22
23+ /**
24+ * @brief The size to be given for new surfaces created by this application
25+ */
26+ Q_PROPERTY(QSize initialSurfaceSize READ initialSurfaceSize WRITE setInitialSurfaceSize NOTIFY initialSurfaceSizeChanged)
27+
28 protected:
29 /// @cond
30 ApplicationInfoInterface(const QString &appId, QObject* parent = 0): QObject(parent) { Q_UNUSED(appId) }
31@@ -284,6 +290,8 @@
32 virtual bool isTouchApp() const = 0;
33 virtual bool exemptFromLifecycle() const = 0;
34 virtual void setExemptFromLifecycle(bool) = 0;
35+ virtual QSize initialSurfaceSize() const = 0;
36+ virtual void setInitialSurfaceSize(const QSize &size) = 0;
37 /// @endcond
38
39 Q_SIGNALS:
40@@ -296,6 +304,7 @@
41 void requestedStateChanged(RequestedState value);
42 void focusedChanged(bool focused);
43 void exemptFromLifecycleChanged(bool exemptFromLifecycle);
44+ void initialSurfaceSizeChanged(const QSize &size);
45 /// @endcond
46 };
47
48
49=== modified file 'include/unity/shell/application/CMakeLists.txt'
50--- include/unity/shell/application/CMakeLists.txt 2015-12-03 19:32:37 +0000
51+++ include/unity/shell/application/CMakeLists.txt 2016-02-02 17:01:15 +0000
52@@ -7,7 +7,7 @@
53
54 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
55
56-set(VERSION 12)
57+set(VERSION 13)
58 set(PKGCONFIG_NAME "unity-shell-application")
59 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
60 set(PKGCONFIG_REQUIRES "Qt5Core")
61
62=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
63--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h 2015-12-03 17:07:15 +0000
64+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h 2016-02-02 17:01:15 +0000
65@@ -59,6 +59,9 @@
66 bool exemptFromLifecycle() const override;
67 void setExemptFromLifecycle(bool exemptFromLifecycle) override;
68
69+ QSize initialSurfaceSize() const override { return QSize(); }
70+ void setInitialSurfaceSize(const QSize &) override {}
71+
72 private:
73 QString m_appId;
74 QString m_name;

Subscribers

People subscribed via source and target branches

to all changes: