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

[Brandon Schaefer]

Mouse no longer steals HUD button focus when typing.

=== Problem ===
The mouse would steal focus of the buttons in the hud while typing. If the mouse was over one of the buttons.

=== Fix ===
The mouse can only steal button focus now until after both last_height == current height ie. it is done animating.

=== Test ===
AP test

[Nick Dedekind (nick-dedekind)]

37 + if (restore_button_input_ && current_height_ == last_known_height_)

You shouldn't need the current_height_ == last_known_height_ as this code should only be called once every time the query changes.
There seems to be something broken in the relyout where the view keeps doing ProcessGrowShrink.
This seems to be because a layout update causes the Min/Max to be set during a call to Relayout(), but there is no checks in those methods to check for an actual change, so it forces a parent relayout.

I think the animation needs some refactoring to get this working cleanly.

review: Needs Fixing

[Nick Dedekind (nick-dedekind)]

Also, I think you should keep the input sensitivity logic inside the HudView and remove it from the button.

review: Needs Fixing

[lp:~brandontschaefer/unity/fix-1066442]

2864. By Brandon Schaefer on 2012-10-23

* Move setting input focus to false to the HudView

[Brandon Schaefer (brandontschaefer)]

Yes, I thought was much. Any simple fix resulted in a regression of choppy animations, though I think it should stop trying to animate the ShrinkGrow process when it is done with either. I can take a look at it.

[Brandon Schaefer (brandontschaefer)]

I need to redo this, as I had a working branch somewhere...but theres are some interesting problems with this bug.

Unmerged revisions

2864. By Brandon Schaefer on 2012-10-23

* Move setting input focus to false to the HudView

2863. By Brandon Schaefer on 2012-10-18

* The mouse no longer steals button focus in the hud while typing.

=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp	2012-09-19 09:50:37 +0000
+++ hud/HudView.cpp	2012-10-23 15:52:21 +0000
@@ -68,6 +68,7 @@
   , selected_button_(0)
   , show_embedded_icon_(true)
   , keyboard_stole_focus_(false)
+  , restore_button_input_(false)
 {
   renderer_.SetOwner(this);
   renderer_.need_redraw.connect([this] () {
@@ -149,8 +150,6 @@
       //shrink
       new_height = last_height - ((last_height - target_height) * progress);
     }
-    
-
     LOG_DEBUG(logger) << "resizing to " << target_height << " (" << new_height << ")"
                      << "View height: " << GetGeometry().height;
     current_height_ = new_height;
@@ -163,6 +162,13 @@
 
   if (diff > grow_anim_length + pause_before_grow_length)
   {
+    if (restore_button_input_ && current_height_ == last_known_height_)
+    {
+      restore_button_input_ = false;
+      for (auto button : buttons_)
+        button->SetInputEventSensitivity(true);
+    }
+
     // ensure we are at our final location and update last known height
     current_height_ = target_height;
     last_known_height_ = target_height;
@@ -226,6 +232,7 @@
     RemoveChild(button.GetPointer());
   }
 
+  restore_button_input_ = true;
   selected_button_ = 0;
   queries_ = queries_;
   buttons_.clear();
@@ -241,6 +248,7 @@
     button->SetMinimumWidth(content_width);
     button->SetMaximumWidth(content_width);
     button->SetQuery(query);
+    button->SetInputEventSensitivity(false);
 
     button_views_->AddView(button.GetPointer(), 0, nux::MINOR_POSITION_LEFT);
 

=== modified file 'hud/HudView.h'
--- hud/HudView.h	2012-09-13 16:56:38 +0000
+++ hud/HudView.h	2012-10-23 15:52:21 +0000
@@ -121,6 +121,7 @@
   bool show_embedded_icon_;
   bool activated_signal_sent_;
   bool keyboard_stole_focus_;
+  bool restore_button_input_;
 };
 
 

=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2012-10-11 01:44:15 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2012-10-23 15:52:21 +0000
@@ -397,6 +397,16 @@
 
         self.assertThat(self.hud.view.selected_button, Eventually(Equals(1)))
 
+    def test_mouse_does_not_steal_button_focus(self):
+        """When typing in the hud the mouse must not steal button focus."""
+
+        self.hud.ensure_visible()
+        (x,y,w,h) = self.hud.view.geometry
+        self.mouse.move(w/4, h/4)
+
+        self.keyboard.type("a")
+        self.assertThat(self.hud.view.selected_button, Eventually(Equals(1)))
+
     def test_keep_focus_on_application_opens(self):
         """The Hud must keep key focus as well as stay open if an app gets opened from an external source. """