Merge lp:~gordallott/unity/fix-focus-issues-on-click into lp:unity

[Gord Allott]

fixes the attached bug, essentially clicking caused the result-view to get focused, but nux sends the you are focused event before the click event. so the result-view focused the first element causing the dash to scroll, so when the click event is actually finally called, its in a completely different part of the dash than you expected

[Neil J. Patel (njpatel)]

review: Approve

=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2011-09-28 16:20:21 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2011-10-03 11:16:33 +0000
@@ -485,11 +485,24 @@
 // crappy name.
 void ResultViewGrid::OnOnKeyNavFocusChange(nux::Area *area)
 {
-
   if (HasKeyFocus())
   {
-    focused_uri_ = results_.front().uri;
-    selected_index_ = 0;
+    if (selected_index_ < 0)
+    {
+      if (mouse_over_index_ >= 0)
+      {
+        // to hack around nux, nux sends the keynavfocuschange event before
+        // mouse clicks, so when mouse click happens we have already scrolled away
+        // because the keynav focus changed
+        focused_uri_ = results_[mouse_over_index_].uri;
+        selected_index_ = mouse_over_index_;
+      }
+      else
+      {
+        focused_uri_ = results_.front().uri;
+        selected_index_ = 0;
+      }
+    }
     NeedRedraw();
 
     int items_per_row = GetItemsPerRow();
@@ -668,6 +681,8 @@
   {
     // we got a click on a button so activate it
     Result result = results_[index];
+    selected_index_ = index;
+    focused_uri_ = result.uri;
     UriActivated.emit(result.uri);
   }
 }