Merge lp:~alan-griffiths/miral/rewire-SurfaceObserver-notifySurfaceModifications into lp:miral

[Alan Griffiths]

[miral-qt] SurfaceObserver::notifySurfaceModifications() got disconnected, reconnect it.

[Daniel d'Andrada (dandrader)]

It will remain unused until we bring back the code that used those SurfaceObserver signals in qtmir::MirSurface (see lp:qtmir).

In any case, that's still one step in the right direction.

Could you at least add a TODO in qtmir::MirSurface constructor so we don't forget about it?

review: Approve

[lp:~alan-griffiths/miral/rewire-SurfaceObserver-notifySurfaceModifications]

427. By Alan Griffiths on 2016-10-31

A bit more missing "wire"

[Alan Griffiths (alan-griffiths)]

> It will remain unused until we bring back the code that used those
> SurfaceObserver signals in qtmir::MirSurface (see lp:qtmir).
>
> In any case, that's still one step in the right direction.
>
> Could you at least add a TODO in qtmir::MirSurface constructor so we don't
> forget about it?

How's that?

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'miral-qt/src/modules/Unity/Application/mirsurface.cpp'
--- miral-qt/src/modules/Unity/Application/mirsurface.cpp	2016-10-12 15:49:08 +0000
+++ miral-qt/src/modules/Unity/Application/mirsurface.cpp	2016-10-31 13:54:51 +0000
@@ -98,6 +98,12 @@
     connect(m_surfaceObserver.get(), &SurfaceObserver::attributeChanged, this, &MirSurface::onAttributeChanged);
     connect(m_surfaceObserver.get(), &SurfaceObserver::nameChanged, this, &MirSurface::nameChanged);
     connect(m_surfaceObserver.get(), &SurfaceObserver::cursorChanged, this, &MirSurface::setCursor);
+    connect(m_surfaceObserver.get(), &SurfaceObserver::minimumWidthChanged, this, &MirSurface::minimumWidth);
+    connect(m_surfaceObserver.get(), &SurfaceObserver::minimumHeightChanged, this, &MirSurface::minimumHeight);
+    connect(m_surfaceObserver.get(), &SurfaceObserver::maximumWidthChanged, this, &MirSurface::maximumWidth);
+    connect(m_surfaceObserver.get(), &SurfaceObserver::maximumHeightChanged, this, &MirSurface::maximumHeight);
+    connect(m_surfaceObserver.get(), &SurfaceObserver::widthIncrementChanged, this, &MirSurface::widthIncrement);
+    connect(m_surfaceObserver.get(), &SurfaceObserver::heightIncrementChanged, this, &MirSurface::heightIncrement);
     connect(m_surfaceObserver.get(), &SurfaceObserver::shellChromeChanged, this, [&](MirShellChrome shell_chrome) {
         setShellChrome(static_cast<Mir::ShellChrome>(shell_chrome));
     });

=== modified file 'miral-qt/src/platforms/mirserver/surfaceobserver.cpp'
--- miral-qt/src/platforms/mirserver/surfaceobserver.cpp	2016-09-23 15:56:53 +0000
+++ miral-qt/src/platforms/mirserver/surfaceobserver.cpp	2016-10-31 13:54:51 +0000
@@ -20,13 +20,14 @@
 #include "logging.h"
 
 #include <QImage>
+#include <QCursor>
 #include <QMetaObject>
 #include <QMutableMapIterator>
 #include <QMutexLocker>
 #include <QPixmap>
 
+#include <miral/window_specification.h>
 #include <mir/geometry/size.h>
-#include <mir/shell/surface_specification.h>
 
 
 namespace {
@@ -154,35 +155,35 @@
     Q_EMIT resized(QSize(size.width.as_int(), size.height.as_int()));
 }
 
-void SurfaceObserver::notifySurfaceModifications(const mir::shell::SurfaceSpecification &modifications)
+void SurfaceObserver::notifySurfaceModifications(const miral::WindowSpecification &modifications)
 {
-    if (modifications.min_width.is_set()) {
-        Q_EMIT minimumWidthChanged(modifications.min_width.value().as_int());
-    }
-    if (modifications.min_height.is_set()) {
-        Q_EMIT minimumHeightChanged(modifications.min_height.value().as_int());
-    }
-    if (modifications.max_width.is_set()) {
-        Q_EMIT maximumWidthChanged(modifications.max_width.value().as_int());
-    }
-    if (modifications.max_height.is_set()) {
-        Q_EMIT maximumHeightChanged(modifications.max_height.value().as_int());
-    }
-    if (modifications.width_inc.is_set()) {
-        Q_EMIT widthIncrementChanged(modifications.width_inc.value().as_int());
-    }
-    if (modifications.height_inc.is_set()) {
-        Q_EMIT heightIncrementChanged(modifications.height_inc.value().as_int());
-    }
-    if (modifications.shell_chrome.is_set()) {
-        Q_EMIT shellChromeChanged(modifications.shell_chrome.value());
-    }
-    if (modifications.input_shape.is_set()) {
-        QRect qRect = calculateBoundingRect(modifications.input_shape.value());
+    if (modifications.min_width().is_set()) {
+        Q_EMIT minimumWidthChanged(modifications.min_width().value().as_int());
+    }
+    if (modifications.min_height().is_set()) {
+        Q_EMIT minimumHeightChanged(modifications.min_height().value().as_int());
+    }
+    if (modifications.max_width().is_set()) {
+        Q_EMIT maximumWidthChanged(modifications.max_width().value().as_int());
+    }
+    if (modifications.max_height().is_set()) {
+        Q_EMIT maximumHeightChanged(modifications.max_height().value().as_int());
+    }
+    if (modifications.width_inc().is_set()) {
+        Q_EMIT widthIncrementChanged(modifications.width_inc().value().as_int());
+    }
+    if (modifications.height_inc().is_set()) {
+        Q_EMIT heightIncrementChanged(modifications.height_inc().value().as_int());
+    }
+    if (modifications.shell_chrome().is_set()) {
+        Q_EMIT shellChromeChanged(modifications.shell_chrome().value());
+    }
+    if (modifications.input_shape().is_set()) {
+        QRect qRect = calculateBoundingRect(modifications.input_shape().value());
         Q_EMIT inputBoundsChanged(qRect);
     }
-    if (modifications.confine_pointer.is_set()) {
-        Q_EMIT confinesMousePointerChanged(modifications.confine_pointer.value() == mir_pointer_confined_to_surface);
+    if (modifications.confine_pointer().is_set()) {
+        Q_EMIT confinesMousePointerChanged(modifications.confine_pointer().value() == mir_pointer_confined_to_surface);
     }
 }
 

=== modified file 'miral-qt/src/platforms/mirserver/surfaceobserver.h'
--- miral-qt/src/platforms/mirserver/surfaceobserver.h	2016-09-23 15:56:53 +0000
+++ miral-qt/src/platforms/mirserver/surfaceobserver.h	2016-10-31 13:54:51 +0000
@@ -18,7 +18,6 @@
 #define SESSIONOBSERVER_H
 
 #include <QByteArray>
-#include <QCursor>
 #include <QObject>
 #include <QMap>
 #include <QMutex>
@@ -31,11 +30,10 @@
     namespace scene {
         class Surface;
     }
-    namespace shell {
-        struct SurfaceSpecification;
-    }
 }
 
+namespace miral { class WindowSpecification; }
+
 class SurfaceObserver : public QObject, public mir::scene::SurfaceObserver
 {
     Q_OBJECT
@@ -69,7 +67,7 @@
     void placed_relative(mir::geometry::Rectangle const& placement) override;
 #endif
 
-    void notifySurfaceModifications(const mir::shell::SurfaceSpecification&);
+    void notifySurfaceModifications(const miral::WindowSpecification&);
 
     static SurfaceObserver *observerForSurface(const mir::scene::Surface *surface);
     static void registerObserverForSurface(SurfaceObserver *observer, const mir::scene::Surface *surface);

=== modified file 'miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp'
--- miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp	2016-10-06 20:56:04 +0000
+++ miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp	2016-10-31 13:54:51 +0000
@@ -17,6 +17,7 @@
 #include "windowmanagementpolicy.h"
 
 #include "screensmodel.h"
+#include "surfaceobserver.h"
 
 #include "miral/window_manager_tools.h"
 #include "miral/window_specification.h"
@@ -81,6 +82,11 @@
 {
     qDebug("Window Modified!");
     CanonicalWindowManagerPolicy::handle_modify_window(windowInfo, modifications);
+
+    std::shared_ptr<mir::scene::Surface> surface{windowInfo.window()};
+    if (SurfaceObserver *observer = SurfaceObserver::observerForSurface(surface.get())) {
+        observer->notifySurfaceModifications(modifications);
+    }
 }
 
 void WindowManagementPolicy::handle_raise_window(miral::WindowInfo &windowInfo)