Merge lp:~alan-griffiths/miral/reduce-WindowManagerTools into lp:miral

[Alan Griffiths]

Remove redundancy from WindowManagerTools - place_and_size() is also redundant as modify_window() supports the same functionality.

[Alan Griffiths (alan-griffiths)]

I did consult Gerry before deleting the functions from miral-qt/src/platforms/mirserver/windowmanagementpolicy.h/cpp

<greyback> alan_g: the fact there was overlap did occur to me, I just considered it a convenience thing. I've no problem removing it
<alan_g> "removing" == deleting these functions?
<greyback> alan_g: yep

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Gerry Boland (gerboland)]

Okies

review: Approve

=== modified file 'include/miral/window_manager_tools.h'
--- include/miral/window_manager_tools.h	2016-08-03 10:01:00 +0000
+++ include/miral/window_manager_tools.h	2016-08-03 10:01:00 +0000
@@ -133,9 +133,6 @@
 
     /// Apply modifications to a window
     void modify_window(WindowInfo& window_info, WindowSpecification const& modifications);
-
-    /// Reposition a window
-    void place_and_size(WindowInfo& window_info, Point const& new_pos, Size const& new_size);
 /** @} */
 
     /** Multi-thread support

=== modified file 'miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp'
--- miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp	2016-07-28 14:26:20 +0000
+++ miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp	2016-08-03 10:01:00 +0000
@@ -179,18 +179,3 @@
     surface->consume(e);
 }
 
-/* Methods to allow Shell to request changes to the window stack */
-void WindowManagementPolicy::focus(const miral::Window window)
-{
-    m_tools.select_active_window(window);
-}
-
-void WindowManagementPolicy::resize(const miral::Window window, const Size &size)
-{
-    m_tools.place_and_size(m_tools.info_for(window), window.top_left(), size);
-}
-
-void WindowManagementPolicy::move(const miral::Window window, const Point &top_left)
-{
-    m_tools.place_and_size(m_tools.info_for(window), top_left, window.size() );
-}

=== modified file 'miral-qt/src/platforms/mirserver/windowmanagementpolicy.h'
--- miral-qt/src/platforms/mirserver/windowmanagementpolicy.h	2016-07-28 14:26:20 +0000
+++ miral-qt/src/platforms/mirserver/windowmanagementpolicy.h	2016-08-03 10:01:00 +0000
@@ -72,10 +72,6 @@
     void deliver_touch_event(const MirTouchEvent *event, const std::shared_ptr<mir::scene::Surface> &surface);
     void deliver_pointer_event(const MirPointerEvent *event, const std::shared_ptr<mir::scene::Surface> &surface);
 
-    void focus(const miral::Window window);
-    void resize(const miral::Window window, const Size &size);
-    void move(const miral::Window window, const Point &top_left);
-
 Q_SIGNALS:
 
 private:

=== modified file 'miral-shell/tiling_window_manager.cpp'
--- miral-shell/tiling_window_manager.cpp	2016-07-29 16:51:06 +0000
+++ miral-shell/tiling_window_manager.cpp	2016-08-03 10:01:00 +0000
@@ -443,7 +443,10 @@
                 auto width  = std::min(new_tile.size.width.as_int()  - offset.dx.as_int(), scaled_width.as_int());
                 auto height = std::min(new_tile.size.height.as_int() - offset.dy.as_int(), scaled_height.as_int());
 
-                tools.place_and_size(window_info, new_pos, {width, height});
+                WindowSpecification modifications;
+                modifications.top_left() = new_pos;
+                modifications.size() = {width, height};
+                tools.modify_window(window_info, modifications);
             }
         }
     }

=== modified file 'miral-shell/titlebar_window_manager.cpp'
--- miral-shell/titlebar_window_manager.cpp	2016-08-03 10:01:00 +0000
+++ miral-shell/titlebar_window_manager.cpp	2016-08-03 10:01:00 +0000
@@ -187,9 +187,18 @@
 
                 auto const new_width = std::max(old_size.width + delta_width, Width{5});
                 auto const new_height = std::max(old_size.height + delta_height, Height{5});
-                auto const new_pos = window.top_left() + delta_x + delta_y;
-
-                tools.place_and_size(tools.info_for(window), new_pos, {new_width, new_height});
+
+                auto new_pos = window.top_left() + delta_x + delta_y;
+                Size new_size{new_width, new_height};
+
+                auto& window_info = tools.info_for(window);
+
+                window_info.constrain_resize(new_pos, new_size);
+
+                WindowSpecification modifications;
+                modifications.top_left() = new_pos;
+                modifications.size() = new_size;
+                tools.modify_window(window_info, modifications);
             }
             consumes_event = true;
         }
@@ -413,9 +422,12 @@
 
     Size new_size{new_width, new_height};
     Point new_pos = top_left + left_resize*delta.dx + top_resize*delta.dy;
-
     window_info.constrain_resize(new_pos, new_size);
-    tools.place_and_size(window_info, new_pos, new_size);
+
+    WindowSpecification modifications;
+    modifications.top_left() = new_pos;
+    modifications.size() = new_size;
+    tools.modify_window(tools.info_for(window), modifications);
 
     return true;
 }

=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2016-07-29 16:51:06 +0000
+++ miral/basic_window_manager.cpp	2016-08-03 10:01:00 +0000
@@ -622,9 +622,10 @@
     if (modifications.input_shape().is_set())
         std::shared_ptr<scene::Surface>(window)->set_input_region(modifications.input_shape().value());
 
+    Point new_pos = modifications.top_left().is_set() ? modifications.top_left().value() : window.top_left();
+
     if (modifications.size().is_set())
     {
-        Point new_pos = window.top_left();
         Size new_size = modifications.size().value();
 
         window_info.constrain_resize(new_pos, new_size);
@@ -634,12 +635,15 @@
              modifications.max_width().is_set() || modifications.max_height().is_set() ||
              modifications.width_inc().is_set() || modifications.height_inc().is_set())
     {
-        Point new_pos = window.top_left();
         Size new_size = window.size();
 
         window_info.constrain_resize(new_pos, new_size);
         place_and_size(window_info, new_pos, new_size);
     }
+    else if (modifications.top_left().is_set())
+    {
+        place_and_size(window_info, new_pos, window.size());
+    }
 
     if (window_info.parent() && modifications.aux_rect().is_set() && modifications.edge_attachment().is_set())
     {

=== modified file 'miral/symbols.map'
--- miral/symbols.map	2016-08-02 09:05:46 +0000
+++ miral/symbols.map	2016-08-03 10:01:00 +0000
@@ -78,8 +78,6 @@
     miral::Window::operator*;
     miral::Window::request_client_surface_close*;
     miral::Window::resize*;
-    miral::Window::set_alpha*;
-    miral::Window::set_state*;
     miral::Window::show*;
     miral::Window::size*;
     miral::Window::surface_id*;
@@ -152,10 +150,8 @@
     miral::WindowManagerTools::kill_active_application*;
     miral::WindowManagerTools::modify_window*;
     miral::WindowManagerTools::operator*;
-    miral::WindowManagerTools::place_and_size*;
     miral::WindowManagerTools::raise_tree*;
     miral::WindowManagerTools::select_active_window*;
-    miral::WindowManagerTools::set_state*;
     miral::WindowManagerTools::window_at*;
     miral::WindowSpecification::?WindowSpecification*;
     miral::WindowSpecification::WindowSpecification*;

=== modified file 'miral/window_manager_tools.cpp'
--- miral/window_manager_tools.cpp	2016-08-03 10:01:00 +0000
+++ miral/window_manager_tools.cpp	2016-08-03 10:01:00 +0000
@@ -77,8 +77,5 @@
 void miral::WindowManagerTools::modify_window(WindowInfo& window_info, WindowSpecification const& modifications)
 { tools->modify_window(window_info,modifications); }
 
-void miral::WindowManagerTools::place_and_size(WindowInfo& window_info, Point const& new_pos, Size const& new_size)
-{ tools->place_and_size(window_info, new_pos, new_size); }
-
 void miral::WindowManagerTools::invoke_under_lock(std::function<void()> const& callback)
 { tools->invoke_under_lock(callback); }