Merge lp:~brandontschaefer/unity/lp.1066442-fix into lp:unity

[Brandon Schaefer]

The HudButtons no longer receive mouse events until the mouse is being moved over the HudView. It resets when any typing happens, so the mouse can no longer steal button focus with out moving it (which in that case you want the button to focus :)

=== Problem ===
When items for the hud appear, and the mouse was over where it appeared at, it would steal button focus.

=== Fix ===
The buttons no longer receives mouse events until the mouse is being moved over the HudView. It resets when any typing happens, so the mouse can no longer steal button focus with out moving it (which in that case you want the button to focus :)

=== Test ===
AP Test

[Marco Trevisan (Treviño) (3v1n0)]

It works well here, thanks.

review: Approve

[Marco Trevisan (Treviño) (3v1n0)]

Confirming again to work...

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2013-02-26 12:57:59 +0000
+++ hud/HudView.cpp	2013-03-18 20:02:24 +0000
@@ -114,6 +114,11 @@
     }
   });
 
+  mouse_move.connect([this] (int x, int y, int dx, int dy, unsigned long mouse_button, unsigned long special_key) {
+    for (auto button : buttons_)
+      button->SetInputEventSensitivity(true);
+  });
+
   mouse_down.connect(sigc::mem_fun(this, &View::OnMouseButtonDown));
 
   Relayout();
@@ -182,7 +187,6 @@
   }
 }
 
-
 void View::ResetToDefault()
 {
   SetQueries(Hud::Queries());
@@ -238,6 +242,7 @@
 
     HudButton::Ptr button(new HudButton());
     buttons_.push_front(button);
+    button->SetInputEventSensitivity(false);
     button->SetMinimumWidth(content_width);
     button->SetMaximumWidth(content_width);
     button->SetQuery(query);
@@ -248,7 +253,7 @@
       query_activated.emit(dynamic_cast<HudButton*>(view)->GetQuery());
     });
 
-    button->mouse_move.connect([&](int x, int y, int dx, int dy, unsigned long mouse_button, unsigned long special_key) {
+    button->mouse_move.connect([this](int x, int y, int dx, int dy, unsigned long mouse_button, unsigned long special_key) {
       if (keyboard_stole_focus_)
       {
         MouseStealsHudButtonFocus();
@@ -256,19 +261,19 @@
       }
     });
 
-    button->mouse_enter.connect([&](int x, int y, unsigned long mouse_button, unsigned long special_key) {
+    button->mouse_enter.connect([this](int x, int y, unsigned long mouse_button, unsigned long special_key) {
       MouseStealsHudButtonFocus();
     });
 
-    button->mouse_leave.connect([&](int x, int y, unsigned long mouse_button, unsigned long special_key) {
+    button->mouse_leave.connect([this](int x, int y, unsigned long mouse_button, unsigned long special_key) {
       SelectLastFocusedButton();
     });
 
-    button->key_nav_focus_activate.connect([&](nux::Area* area) {
+    button->key_nav_focus_activate.connect([this](nux::Area* area) {
       query_activated.emit(dynamic_cast<HudButton*>(area)->GetQuery());
     });
 
-    button->key_nav_focus_change.connect([&](nux::Area* area, bool recieving, nux::KeyNavDirection direction){
+    button->key_nav_focus_change.connect([this](nux::Area* area, bool recieving, nux::KeyNavDirection direction){
       if (recieving)
         query_selected.emit(dynamic_cast<HudButton*>(area)->GetQuery());
     });
@@ -418,9 +423,7 @@
   search_changed.emit(search_string);
 
   for(auto button : buttons_)
-  {
     button->fake_focused = false;
-  }
 
   if (!buttons_.empty())
     buttons_.back()->fake_focused = true;

=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2013-02-04 19:54:47 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2013-03-18 20:02:24 +0000
@@ -459,6 +459,17 @@
 
         self.assertProperty(char_win, is_active=True)
 
+    def test_mouse_does_not_steal_button_focus(self):
+        """When typing in the hud the mouse must not steal button focus."""
+
+        self.unity.hud.ensure_visible()
+
+        (x,y,w,h) = self.unity.hud.view.geometry
+        self.mouse.move(w/4, h/4)
+
+        self.keyboard.type("a")
+        self.assertThat(self.unity.hud.view.selected_button, Eventually(Equals(1)))
+
 
 class HudLauncherInteractionsTests(HudTestsBase):