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

[Michał Sawicz]

Unmerged revisions

207. By Daniel d'Andrada on 2016-02-02

Added ApplicationInfoInterface.initialSurfaceSize

=== modified file 'include/unity/shell/application/ApplicationInfoInterface.h'
--- include/unity/shell/application/ApplicationInfoInterface.h	2015-12-03 19:03:29 +0000
+++ include/unity/shell/application/ApplicationInfoInterface.h	2016-02-02 17:01:15 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013,2015 Canonical Ltd.
+ * Copyright 2013,2015,2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,7 @@
 #include <QtCore/QObject>
 #include <QtCore/QUrl>
 #include <QColor>
+#include <QSize>
 
 namespace unity
 {
@@ -211,6 +212,11 @@
      */
     Q_PROPERTY(bool exemptFromLifecycle READ exemptFromLifecycle WRITE setExemptFromLifecycle NOTIFY exemptFromLifecycleChanged)
 
+    /**
+     * @brief The size to be given for new surfaces created by this application
+     */
+    Q_PROPERTY(QSize initialSurfaceSize READ initialSurfaceSize WRITE setInitialSurfaceSize NOTIFY initialSurfaceSizeChanged)
+
 protected:
     /// @cond
     ApplicationInfoInterface(const QString &appId, QObject* parent = 0): QObject(parent) { Q_UNUSED(appId) }
@@ -284,6 +290,8 @@
     virtual bool isTouchApp() const = 0;
     virtual bool exemptFromLifecycle() const = 0;
     virtual void setExemptFromLifecycle(bool) = 0;
+    virtual QSize initialSurfaceSize() const = 0;
+    virtual void setInitialSurfaceSize(const QSize &size) = 0;
     /// @endcond
 
 Q_SIGNALS:
@@ -296,6 +304,7 @@
     void requestedStateChanged(RequestedState value);
     void focusedChanged(bool focused);
     void exemptFromLifecycleChanged(bool exemptFromLifecycle);
+    void initialSurfaceSizeChanged(const QSize &size);
     /// @endcond
 };
 
 
=== modified file 'include/unity/shell/application/CMakeLists.txt'
--- include/unity/shell/application/CMakeLists.txt	2015-12-03 19:32:37 +0000
+++ include/unity/shell/application/CMakeLists.txt	2016-02-02 17:01:15 +0000
@@ -7,7 +7,7 @@
 
 set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
 
-set(VERSION 12)
+set(VERSION 13)
 set(PKGCONFIG_NAME "unity-shell-application")
 set(PKGCONFIG_DESCRIPTION "Unity shell Application APIs")
 set(PKGCONFIG_REQUIRES "Qt5Core")
 
=== modified file 'test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h'
--- test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2015-12-03 17:07:15 +0000
+++ test/qmltest/mocks/plugins/Unity/Application/Mocks/MockApplicationInfo.h	2016-02-02 17:01:15 +0000
@@ -59,6 +59,9 @@
     bool exemptFromLifecycle() const override;
     void setExemptFromLifecycle(bool exemptFromLifecycle) override;
 
+    QSize initialSurfaceSize() const override { return QSize(); }
+    void setInitialSurfaceSize(const QSize &) override {}
+
 private:
     QString m_appId;
     QString m_name;