Merge lp:~gerboland/miral/use-miral-close into lp:miral

[Gerry Boland]

[miral-qt] restore the window request close feature

[Alan Griffiths (alan-griffiths)]

+void WindowManagementPolicy::ask_client_to_close(const miral::Window &window)
+{
+ m_tools.ask_client_to_close(window);
+}

I assume this is running on a Qt thread?

So it needs to do m_tools.invoke_under_lock(...).

review: Needs Fixing

[lp:~gerboland/miral/use-miral-close]

273. By Gerry Boland on 2016-08-15

Invoke under lock

[Gerry Boland (gerboland)]

Done

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file 'miral-qt/src/common/windowcontrollerinterface.h'
--- miral-qt/src/common/windowcontrollerinterface.h	2016-08-03 15:29:44 +0000
+++ miral-qt/src/common/windowcontrollerinterface.h	2016-08-15 12:36:21 +0000
@@ -41,6 +41,8 @@
     virtual void resize(const miral::Window &window, const QSize &size) = 0;
     virtual void move  (const miral::Window &window, const QPoint &topLeft) = 0;
 
+    virtual void requestClose(const miral::Window &window) = 0;
+
     virtual void setState(const miral::Window &window, const MirSurfaceState state) = 0;
 
     virtual void deliverKeyboardEvent(const miral::Window &window, const MirKeyboardEvent *event) = 0;

=== modified file 'miral-qt/src/modules/Unity/Application/mirsurface.cpp'
--- miral-qt/src/modules/Unity/Application/mirsurface.cpp	2016-08-12 12:04:13 +0000
+++ miral-qt/src/modules/Unity/Application/mirsurface.cpp	2016-08-15 12:36:21 +0000
@@ -1058,7 +1058,7 @@
 
     m_closingState = CloseOverdue;
 
-    //m_session->session()->destroy_surface(m_windowInfo); TODO use WindowManagerTools::ask_client_to_close(window)
+    m_controller->requestClose(m_windowInfo.window);
 }
 
 void MirSurface::setCloseTimer(AbstractTimer *timer)

=== modified file 'miral-qt/src/platforms/mirserver/windowcontroller.cpp'
--- miral-qt/src/platforms/mirserver/windowcontroller.cpp	2016-08-03 15:29:44 +0000
+++ miral-qt/src/platforms/mirserver/windowcontroller.cpp	2016-08-15 12:36:21 +0000
@@ -48,6 +48,13 @@
     }
 }
 
+void WindowController::requestClose(const miral::Window &window)
+{
+    if (m_policy) {
+        m_policy->ask_client_to_close(window);
+    }
+}
+
 void WindowController::setActiveFocus(const miral::Window &/*window*/, const bool /*activeFocus*/)
 {
 

=== modified file 'miral-qt/src/platforms/mirserver/windowcontroller.h'
--- miral-qt/src/platforms/mirserver/windowcontroller.h	2016-08-03 15:29:44 +0000
+++ miral-qt/src/platforms/mirserver/windowcontroller.h	2016-08-15 12:36:21 +0000
@@ -33,6 +33,8 @@
     void resize(const miral::Window &window, const QSize &size) override;
     void move  (const miral::Window &window, const QPoint &topLeft) override;
 
+    void requestClose(const miral::Window &window) override;
+
     void setActiveFocus(const miral::Window &window, const bool activeFocus) override;
     void setState(const miral::Window &window, const MirSurfaceState state) override;
 

=== modified file 'miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp'
--- miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp	2016-08-12 12:09:39 +0000
+++ miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp	2016-08-15 12:36:21 +0000
@@ -207,3 +207,10 @@
     modifications.top_left() = topLeft;
     m_tools.modify_window(m_tools.info_for(window), modifications);
 }
+
+void WindowManagementPolicy::ask_client_to_close(const miral::Window &window)
+{
+    m_tools.invoke_under_lock([&window, this]() {
+        m_tools.ask_client_to_close(window);
+    });
+}

=== modified file 'miral-qt/src/platforms/mirserver/windowmanagementpolicy.h'
--- miral-qt/src/platforms/mirserver/windowmanagementpolicy.h	2016-08-12 12:09:39 +0000
+++ miral-qt/src/platforms/mirserver/windowmanagementpolicy.h	2016-08-15 12:36:21 +0000
@@ -77,6 +77,8 @@
     void resize(const miral::Window &window, const Size size);
     void move  (const miral::Window &window, const Point topLeft);
 
+    void ask_client_to_close(const miral::Window &window);
+
 Q_SIGNALS:
 
 private: