Merge lp:~unity-team/unity-api/miral-version-bump into lp:unity-api

[Gerry Boland]

Add apis for QtMir 0.2 (based on MirAL), bump to 8.0

[lp:~unity-team/unity-api/miral-version-bump]

256. By Gerry Boland on 2016-10-14

Bad version chosen, take better one 8.0

Unmerged revisions

256. By Gerry Boland on 2016-10-14

Bad version chosen, take better one 8.0

255. By Gerry Boland on 2016-10-14

Bump debian package version

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-09 14:39:28 +0000
+++ debian/changelog	2016-10-14 14:33:43 +0000
@@ -1,3 +1,9 @@
+unity-api (8.0+16.10.20160909-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add APIs for QtMir 0.2 (using MirAL)
+
+ -- Gerry Boland <[e-mail]>  Fri, 14 Oct 2016 15:25:38 +0100
+
 unity-api (7.119+16.10.20160909-0ubuntu1) yakkety; urgency=medium
 
   [ Daniel d'Andrada ]
 
=== modified file 'include/unity/shell/application/Mir.h'
--- include/unity/shell/application/Mir.h	2016-02-17 12:56:18 +0000
+++ include/unity/shell/application/Mir.h	2016-10-14 14:33:43 +0000
@@ -63,9 +63,15 @@
         RestoredState,
         MinimizedState,
         MaximizedState,
-        VertMaximizedState,
         FullscreenState,
+        MaximizedLeftState,
+        MaximizedRightState,
         HorizMaximizedState,
+        VertMaximizedState,
+        MaximizedTopLeftState,
+        MaximizedTopRightState,
+        MaximizedBottomLeftState,
+        MaximizedBottomRightState,
         HiddenState,
     };
 
@@ -110,7 +116,10 @@
     /// @endcond
 };
 
+Q_DECLARE_METATYPE(Mir::Type)
+Q_DECLARE_METATYPE(Mir::State)
 Q_DECLARE_METATYPE(Mir::OrientationAngle)
 Q_DECLARE_METATYPE(Mir::ShellChrome)
+Q_DECLARE_METATYPE(Mir::FormFactor)
 
 #endif // UNITY_SHELL_APPLICATION_MIR_H
 
=== removed file 'include/unity/shell/application/MirFocusControllerInterface.h'
--- include/unity/shell/application/MirFocusControllerInterface.h	2016-04-13 16:47:27 +0000
+++ include/unity/shell/application/MirFocusControllerInterface.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2016 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef UNITY_SHELL_APPLICATION_MIRFOCUSCONTROLLERINTERFACE_H
-#define UNITY_SHELL_APPLICATION_MIRFOCUSCONTROLLERINTERFACE_H
-
-#include <QObject>
-
-namespace unity {
-namespace shell {
-namespace application {
-
-class MirSurfaceInterface;
-
-/**
- * @brief Defines which MirSurface has focus
- *
- * Even though QQuickWindow::activeFocusItem is who ultimately defines the focused MirSurface
- * in the QML scene, the two might not necessarily match all the time. And also this is a cleaner
- * way of keeping tabs on the focused MirSurface as it doesn't involve unrelated QML items.
- */
-class MirFocusControllerInterface : public QObject
-{
-    Q_OBJECT
-
-    /**
-     * @brief The MirSurface which currently has focus, if any.
-     *
-     * Shell provides this information.
-     *
-     * But it can also be changed by the implementation. When a MirSurfaceItem gets active
-     * focus from the QML scene, it will also call MirFocusController::setFocusedSurface for
-     * the MirSurface it holds.
-     */
-    Q_PROPERTY(unity::shell::application::MirSurfaceInterface* focusedSurface READ focusedSurface
-                                                                              WRITE setFocusedSurface
-                                                                              NOTIFY focusedSurfaceChanged)
-public:
-    /// @cond
-    MirFocusControllerInterface(QObject *parent = 0) : QObject(parent) {}
-    virtual ~MirFocusControllerInterface() {}
-
-    virtual void setFocusedSurface(MirSurfaceInterface *surface) = 0;
-    virtual MirSurfaceInterface* focusedSurface() const = 0;
-    /// @endcond
-Q_SIGNALS:
-    /// @cond
-    void focusedSurfaceChanged();
-    /// @endcond
-};
-
-} // namespace application
-} // namespace shell
-} // namespace unity
-
-#endif // UNITY_SHELL_APPLICATION_MIRFOCUSCONTROLLERINTERFACE_H
 
=== modified file 'include/unity/shell/application/MirSurfaceInterface.h'
--- include/unity/shell/application/MirSurfaceInterface.h	2016-09-05 13:21:24 +0000
+++ include/unity/shell/application/MirSurfaceInterface.h	2016-10-14 14:33:43 +0000
@@ -58,6 +58,16 @@
     Q_PROPERTY(QString persistentId READ persistentId CONSTANT)
 
     /**
+     * @brief Position of the current surface buffer, in pixels.
+     */
+    Q_PROPERTY(QPoint position READ position NOTIFY positionChanged)
+
+    /**
+     * @brief Requested position of the current surface buffer, in pixels.
+     */
+    Q_PROPERTY(QPoint requestedPosition READ requestedPosition WRITE setRequestedPosition NOTIFY requestedPositionChanged)
+
+    /**
      * @brief Size of the current surface buffer, in pixels.
      */
     Q_PROPERTY(QSize size READ size NOTIFY sizeChanged)
@@ -65,7 +75,7 @@
     /**
      * @brief State of the surface
      */
-    Q_PROPERTY(Mir::State state READ state WRITE setState NOTIFY stateChanged)
+    Q_PROPERTY(Mir::State state READ state NOTIFY stateChanged)
 
     /**
      * @brief True if it has a mir client bound to it.
@@ -165,12 +175,13 @@
 
     virtual QString persistentId() const = 0;
 
+    virtual QPoint position() const = 0;
+
     virtual QSize size() const = 0;
     virtual void resize(int width, int height) = 0;
     virtual void resize(const QSize &size) = 0;
 
     virtual Mir::State state() const = 0;
-    virtual void setState(Mir::State qmlState) = 0;
 
     virtual bool live() const = 0;
 
@@ -196,6 +207,9 @@
     virtual QRect inputBounds() const = 0;
 
     virtual bool confinesMousePointer() const = 0;
+
+    virtual QPoint requestedPosition() const = 0;
+    virtual void setRequestedPosition(const QPoint &) = 0;
     /// @endcond
 
     /**
@@ -216,6 +230,12 @@
      */
     Q_INVOKABLE virtual void raise() = 0;
 
+public Q_SLOTS:
+    /**
+     * @brief Requests a change to the specified state
+     */
+    virtual void requestState(Mir::State state) = 0;
+
 Q_SIGNALS:
     /// @cond
     void typeChanged(Mir::Type value);
@@ -223,6 +243,8 @@
     void visibleChanged(bool visible);
     void stateChanged(Mir::State value);
     void orientationAngleChanged(Mir::OrientationAngle value);
+    void positionChanged(QPoint position);
+    void requestedPositionChanged(QPoint position);
     void sizeChanged(const QSize &value);
     void nameChanged(const QString &name);
     void minimumWidthChanged(int value);
 
=== modified file 'include/unity/shell/application/MirSurfaceItemInterface.h'
--- include/unity/shell/application/MirSurfaceItemInterface.h	2016-03-11 10:39:33 +0000
+++ include/unity/shell/application/MirSurfaceItemInterface.h	2016-10-14 14:33:43 +0000
@@ -56,7 +56,7 @@
     /**
      * @brief State of the given surface or Mir.UnknownState if no surface is set
      */
-    Q_PROPERTY(Mir::State surfaceState READ surfaceState WRITE setSurfaceState NOTIFY surfaceStateChanged)
+    Q_PROPERTY(Mir::State surfaceState READ surfaceState NOTIFY surfaceStateChanged)
 
     /**
      * @brief Name of the given surface or an empty string if no surface is set
@@ -128,7 +128,6 @@
     virtual bool live() const = 0;
 
     virtual Mir::State surfaceState() const = 0;
-    virtual void setSurfaceState(Mir::State) = 0;
 
     virtual Mir::OrientationAngle orientationAngle() const = 0;
     virtual void setOrientationAngle(Mir::OrientationAngle angle) = 0;