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

[Alan Griffiths]

Fix focus logic: Surfaces that have not painted are not visible; surfaces that are not visible should not become active; and, titlebars cannot rely on the parent advise_focus_lost() events arriving after the titlebar creation.

[Gerry Boland (gerboland)]

Looks ok

review: Approve

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

377. By Alan Griffiths on 2016-09-30

Fix broken test

=== modified file 'miral-shell/titlebar_window_manager.cpp'
--- miral-shell/titlebar_window_manager.cpp	2016-09-28 11:42:35 +0000
+++ miral-shell/titlebar_window_manager.cpp	2016-09-30 09:40:01 +0000
@@ -268,7 +268,13 @@
     if (application == titlebar_provider->session())
     {
         titlebar_provider->advise_new_titlebar(window_info);
-        return;
+
+        auto const parent = window_info.parent();
+
+        if (tools.active_window() == parent)
+            titlebar_provider->paint_titlebar_for(parent, 0xFF);
+        else
+            titlebar_provider->paint_titlebar_for(parent, 0x3F);
     }
 }
 

=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2016-09-23 16:55:46 +0000
+++ miral/basic_window_manager.cpp	2016-09-30 09:40:01 +0000
@@ -892,7 +892,7 @@
         }
     }
 
-    if (info_for_hint.can_be_active())
+    if (info_for_hint.can_be_active() && info_for_hint.is_visible())
     {
         mru_active_windows.push(hint);
         focus_controller->set_focus_to(hint.application(), hint);

=== modified file 'miral/window_info.cpp'
--- miral/window_info.cpp	2016-09-23 14:13:40 +0000
+++ miral/window_info.cpp	2016-09-30 09:40:01 +0000
@@ -18,6 +18,8 @@
 
 #include "miral/window_info.h"
 
+#include <mir/scene/surface.h>
+
 #include <limits>
 
 using namespace mir::geometry;
@@ -213,9 +215,10 @@
     case mir_surface_state_minimized:
         return false;
     default:
-        break;
+        if (std::shared_ptr<mir::scene::Surface> surface = window())
+            return surface->visible();
     }
-    return true;
+    return false;
 }
 
 void miral::WindowInfo::constrain_resize(Point& requested_pos, Size& requested_size) const

=== modified file 'test/test_window_manager_tools.h'
--- test/test_window_manager_tools.h	2016-09-23 11:59:53 +0000
+++ test/test_window_manager_tools.h	2016-09-30 09:40:01 +0000
@@ -86,6 +86,8 @@
     mir::geometry::Size size() const override { return  size_; }
     void resize(mir::geometry::Size const& size) override { size_ = size; }
 
+    bool visible() const override { return  true; }
+
     std::string name_;
     MirSurfaceType type_;
     mir::geometry::Point top_left_;