Merge lp:~alan-griffiths/miral/miral-shell-window-titles into lp:miral

[Alan Griffiths]

[miral-shell] Fix glitches by repainting titlebar on resize

[Gerry Boland (gerboland)]

Confirmed fix

review: Approve

=== modified file 'miral-shell/titlebar_provider.cpp'
--- miral-shell/titlebar_provider.cpp	2016-10-27 10:32:15 +0000
+++ miral-shell/titlebar_provider.cpp	2016-10-27 14:08:03 +0000
@@ -218,6 +218,8 @@
 
 void TitlebarProvider::paint_titlebar_for(miral::WindowInfo const& info, int intensity)
 {
+    this->intensity = intensity;
+
     if (auto data = find_titlebar_data(info.window()))
     {
         auto const title = info.name();
@@ -254,14 +256,18 @@
     }
 }
 
-void TitlebarProvider::resize_titlebar_for(miral::Window const& window, Size const& size)
+void TitlebarProvider::resize_titlebar_for(miral::WindowInfo const& window_info, Size const& size)
 {
+    auto const window = window_info.window();
+
     if (window.size().width == size.width)
         return;
 
     if (auto titlebar_window = find_titlebar_window(window))
     {
         titlebar_window.resize({size.width, title_bar_height});
+
+        repaint_titlebar_for(window_info);
     }
 }
 
@@ -314,6 +320,18 @@
         }
 
         tools.modify_window(titlebar, modifications);
+        repaint_titlebar_for(window_info);
+    }
+}
+
+void TitlebarProvider::repaint_titlebar_for(miral::WindowInfo const& window_info)
+{
+    if (auto data = find_titlebar_data(window_info.window()))
+    {
+        auto const title = window_info.name();
+
+        if (auto surface = data->titlebar.load())
+            enqueue_work([this, surface, title]{ paint_surface(surface, title, intensity); });
     }
 }
 

=== modified file 'miral-shell/titlebar_provider.h'
--- miral-shell/titlebar_provider.h	2016-10-26 09:20:13 +0000
+++ miral-shell/titlebar_provider.h	2016-10-27 14:08:03 +0000
@@ -69,7 +69,7 @@
     void place_new_titlebar(miral::WindowSpecification& window_spec);
     void paint_titlebar_for(miral::WindowInfo const& window, int intensity);
     void destroy_titlebar_for(miral::Window const& window);
-    void resize_titlebar_for(miral::Window const& window, mir::geometry::Size const& size);
+    void resize_titlebar_for(miral::WindowInfo const& window_info, mir::geometry::Size const& size);
     void advise_new_titlebar(miral::WindowInfo const& window_info);
     void advise_state_change(miral::WindowInfo const& window_info, MirSurfaceState state);
 
@@ -92,6 +92,7 @@
     std::mutex mutable mutex;
     miral::toolkit::Connection connection;
     std::weak_ptr<mir::scene::Session> weak_session;
+    std::atomic<int> intensity{0xff};
 
     SurfaceMap window_to_titlebar;
     TitleMap windows_awaiting_titlebar;
@@ -99,6 +100,7 @@
     static void insert(MirSurface* surface, Data* data);
     Data* find_titlebar_data(miral::Window const& window);
     miral::Window find_titlebar_window(miral::Window const& window) const;
+    void repaint_titlebar_for(miral::WindowInfo const& window_info);
 };
 
 

=== modified file 'miral-shell/titlebar_window_manager.cpp'
--- miral-shell/titlebar_window_manager.cpp	2016-10-26 10:24:26 +0000
+++ miral-shell/titlebar_window_manager.cpp	2016-10-27 14:08:03 +0000
@@ -323,7 +323,7 @@
 {
     CanonicalWindowManagerPolicy::advise_resize(window_info, new_size);
 
-    titlebar_provider->resize_titlebar_for(window_info.window(), new_size);
+    titlebar_provider->resize_titlebar_for(window_info, new_size);
 }
 
 void TitlebarWindowManagerPolicy::advise_delete_window(WindowInfo const& window_info)