Merge lp:~alan-griffiths/miral/fix-1603086 into lp:miral

[Alan Griffiths]

Add support for modifying surface attachment

[lp:~alan-griffiths/miral/fix-1603086]

229. By Alan Griffiths on 2016-07-15

Revert unnecessary logic

[Andreas Pokorny (andreas-pokorny)]

I have been using that revision for testing gtk changes.. No new problems were found, and it fixes the tooltip placement.

review: Approve

=== modified file 'miral-shell/titlebar_provider.cpp'
--- miral-shell/titlebar_provider.cpp	2016-07-11 15:11:07 +0000
+++ miral-shell/titlebar_provider.cpp	2016-07-15 17:02:36 +0000
@@ -134,11 +134,22 @@
 
 void TitlebarProvider::destroy_titlebar_for(miral::Window const& window)
 {
-    enqueue_work([this, window]
+    if (auto data = find_titlebar_data(window))
+    {
+        if (auto surface = data->titlebar.exchange(nullptr))
         {
-            std::lock_guard<decltype(mutex)> lock{mutex};
-            window_to_titlebar.erase(window);
-        });
+            enqueue_work([surface]
+                 {
+                     mir_surface_release(surface, &null_surface_callback, nullptr);
+                 });
+        }
+
+        enqueue_work([this, window]
+            {
+                std::lock_guard<decltype(mutex)> lock{mutex};
+                window_to_titlebar.erase(window);
+            });
+    }
 }
 
 void TitlebarProvider::resize_titlebar_for(miral::Window const& window, Size const& size)
@@ -200,7 +211,7 @@
 
 TitlebarProvider::Data::~Data()
 {
-    if (auto const surface = titlebar.load())
+    if (auto surface = titlebar.exchange(nullptr))
         mir_surface_release(surface, &null_surface_callback, nullptr);
 }
 

=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2016-07-13 10:28:40 +0000
+++ miral/basic_window_manager.cpp	2016-07-15 17:02:36 +0000
@@ -638,6 +638,19 @@
         place_and_size(window_info, new_pos, new_size);
     }
 
+    if (window_info.parent() && modifications.aux_rect().is_set() && modifications.edge_attachment().is_set())
+    {
+        auto parent = window_info.parent();
+
+        if (parent)
+        {
+            auto new_pos = place_relative(parent.top_left(), modifications);
+
+            if (new_pos.is_set())
+                move_tree(window_info, new_pos.value() - window.top_left());
+        }
+    }
+
     if (modifications.state().is_set())
     {
         set_state(window_info, modifications.state().value());
@@ -937,8 +950,6 @@
         parameters.state() = mir_surface_state_restored;
 
     auto const active_display_area = active_display();
-
-    auto const width = parameters.size().value().width.as_int();
     auto const height = parameters.size().value().height.as_int();
 
     bool positioned = false;
@@ -976,41 +987,12 @@
 
     if (has_parent && parameters.aux_rect().is_set() && parameters.edge_attachment().is_set())
     {
-        auto parent = info_for(parameters.parent().value()).window();
-
-        auto const edge_attachment = parameters.edge_attachment().value();
-        auto const aux_rect = parameters.aux_rect().value();
-        auto const parent_top_left = parent.top_left();
-        auto const top_left = aux_rect.top_left     -Point{} + parent_top_left;
-        auto const top_right= aux_rect.top_right()  -Point{} + parent_top_left;
-        auto const bot_left = aux_rect.bottom_left()-Point{} + parent_top_left;
-
-        if (edge_attachment & mir_edge_attachment_vertical)
-        {
-            if (active_display_area.contains(top_right + Displacement{width, height}))
-            {
-                parameters.top_left() = top_right;
-                positioned = true;
-            }
-            else if (active_display_area.contains(top_left + Displacement{-width, height}))
-            {
-                parameters.top_left() = top_left + Displacement{-width, 0};
-                positioned = true;
-            }
-        }
-
-        if (edge_attachment & mir_edge_attachment_horizontal)
-        {
-            if (active_display_area.contains(bot_left + Displacement{width, height}))
-            {
-                parameters.top_left() = bot_left;
-                positioned = true;
-            }
-            else if (active_display_area.contains(top_left + Displacement{width, -height}))
-            {
-                parameters.top_left() = top_left + Displacement{0, -height};
-                positioned = true;
-            }
+        auto const position = place_relative(info_for(parameters.parent().value()).window().top_left(), parameters);
+
+        if (position.is_set())
+        {
+            parameters.top_left() = position.value();
+            positioned = true;
         }
     }
     else if (has_parent)
@@ -1076,3 +1058,44 @@
 
     return parameters;
 }
+
+auto miral::BasicWindowManager::place_relative(Point const& parent_top_left, WindowSpecification const& parameters)
+-> mir::optional_value<Point>
+{
+    mir::optional_value<Point> result;
+    auto const active_display_area = active_display();
+    auto const width = parameters.size().value().width.as_int();
+    auto const height = parameters.size().value().height.as_int();
+
+    auto const edge_attachment = parameters.edge_attachment().value();
+    auto const aux_rect = parameters.aux_rect().value();
+    auto const top_left = aux_rect.top_left     -Point{} + parent_top_left;
+    auto const top_right= aux_rect.top_right()  -Point{} + parent_top_left;
+    auto const bot_left = aux_rect.bottom_left()-Point{} + parent_top_left;
+
+    if (edge_attachment & mir_edge_attachment_vertical)
+        {
+            if (active_display_area.contains(top_right + Displacement{width, height}))
+            {
+                result = top_right;
+            }
+            else if (active_display_area.contains(top_left + Displacement{-width, height}))
+            {
+                result = top_left + Displacement{-width, 0};
+            }
+        }
+
+    if (edge_attachment & mir_edge_attachment_horizontal)
+        {
+            if (active_display_area.contains(bot_left + Displacement{width, height}))
+            {
+                result = bot_left;
+            }
+            else if (active_display_area.contains(top_left + Displacement{width, -height}))
+            {
+                result = top_left + Displacement{0, -height};
+            }
+        }
+
+    return result;
+}

=== modified file 'miral/basic_window_manager.h'
--- miral/basic_window_manager.h	2016-06-29 13:17:33 +0000
+++ miral/basic_window_manager.h	2016-07-15 17:02:36 +0000
@@ -161,8 +161,9 @@
 
     auto can_activate_window_for_session(miral::Application const& session) -> bool;
 
-    auto place_new_surface(ApplicationInfo const& app_info, WindowSpecification parameters)
-        -> WindowSpecification;
+    auto place_new_surface(ApplicationInfo const& app_info, WindowSpecification parameters) -> WindowSpecification;
+    auto place_relative(Point const& parent_top_left, miral::WindowSpecification const& parameters) -> mir::optional_value<Point>;
+
     auto build_window(Application const& application, WindowSpecification const& spec)
         -> WindowInfo&;
     void move_tree(miral::WindowInfo& root, mir::geometry::Displacement movement);