Merge lp:~azzar1/unity/fix-backward-keynav into lp:unity

[Andrea Azzarone]

Fix a bug in the backward key navigation (bug. 931025)

[Tim Penhey (thumper)]

Looks good.

review: Approve

=== modified file 'plugins/unityshell/src/ResultViewGrid.cpp'
--- plugins/unityshell/src/ResultViewGrid.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/ResultViewGrid.cpp	2012-02-12 16:31:19 +0000
@@ -72,9 +72,9 @@
   vertical_spacing.changed.connect(needredraw_lambda);
   padding.changed.connect(needredraw_lambda);
 
-  key_nav_focus_change.connect (sigc::mem_fun (this, &ResultViewGrid::OnOnKeyNavFocusChange));
-  key_nav_focus_activate.connect ([&] (nux::Area *area) { UriActivated.emit (focused_uri_); });
-  key_down.connect (sigc::mem_fun (this, &ResultViewGrid::OnKeyDown));
+  key_nav_focus_change.connect(sigc::mem_fun(this, &ResultViewGrid::OnKeyNavFocusChange));
+  key_nav_focus_activate.connect([&] (nux::Area *area) { UriActivated.emit (focused_uri_); });
+  key_down.connect(sigc::mem_fun(this, &ResultViewGrid::OnKeyDown));
   mouse_move.connect(sigc::mem_fun(this, &ResultViewGrid::MouseMove));
   mouse_click.connect(sigc::mem_fun(this, &ResultViewGrid::MouseClick));
 
@@ -488,8 +488,7 @@
   return this;
 }
 
-// crappy name.
-void ResultViewGrid::OnOnKeyNavFocusChange(nux::Area *area, bool has_focus, nux::KeyNavDirection direction)
+void ResultViewGrid::OnKeyNavFocusChange(nux::Area *area, bool has_focus, nux::KeyNavDirection direction)
 {
   if (HasKeyFocus())
   {
@@ -504,7 +503,7 @@
 
     int items_per_row = GetItemsPerRow();
 
-    if (direction == nux::KEY_NAV_UP)
+    if (direction == nux::KEY_NAV_UP && expanded)
     {
       // This View just got focused through keyboard navigation and the
       // focus is comming from the bottom. We want to focus the 

=== modified file 'plugins/unityshell/src/ResultViewGrid.h'
--- plugins/unityshell/src/ResultViewGrid.h	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/ResultViewGrid.h	2012-02-12 16:31:19 +0000
@@ -20,10 +20,8 @@
  *
  */
 
-
-
-#ifndef RESULTVIEWGRID_H
-#define RESULTVIEWGRID_H
+#ifndef UNITYSHELL_RESULTVIEWGRID_H
+#define UNITYSHELL_RESULTVIEWGRID_H
 
 #include <UnityCore/Categories.h>
 #include "ResultView.h"
@@ -69,7 +67,7 @@
   virtual bool InspectKeyEvent(unsigned int eventType, unsigned int keysym, const char* character);
   virtual bool AcceptKeyNavFocus();
   virtual nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
-  virtual void OnOnKeyNavFocusChange(nux::Area* area, bool has_focus, nux::KeyNavDirection direction);
+  virtual void OnKeyNavFocusChange(nux::Area* area, bool has_focus, nux::KeyNavDirection direction);
   void OnKeyDown(unsigned long event_type, unsigned long event_keysym, unsigned long event_state, const TCHAR* character, unsigned short key_repeat_count);
 
   virtual void Draw(nux::GraphicsEngine& GfxContext, bool force_draw);;
@@ -112,6 +110,7 @@
 
 };
 
-}
-}
-#endif // RESULTVIEWGRID_H
+} // namespace dash
+} // namespace unity
+
+#endif // UNITYSHELL_RESULTVIEWGRID_H

=== modified file 'plugins/unityshell/src/SearchBar.cpp'
--- plugins/unityshell/src/SearchBar.cpp	2012-02-08 23:21:20 +0000
+++ plugins/unityshell/src/SearchBar.cpp	2012-02-12 16:31:19 +0000
@@ -542,8 +542,11 @@
 
 void SearchBar::AddProperties(GVariantBuilder* builder)
 {
-  unity::variant::BuilderWrapper(builder).add(GetGeometry());
-  g_variant_builder_add (builder, "{sv}", "search_string", g_variant_new_string (pango_entry_->GetText().c_str()) );
+  unity::variant::BuilderWrapper wrapper(builder);
+
+  wrapper.add(GetGeometry());
+  wrapper.add("has_focus", pango_entry_->HasKeyFocus());
+  wrapper.add("search_string", pango_entry_->GetText());
 }
 
 } // namespace unity

=== modified file 'tests/autopilot/autopilot/emulators/unity.py'
--- tests/autopilot/autopilot/emulators/unity.py	2012-02-08 00:32:46 +0000
+++ tests/autopilot/autopilot/emulators/unity.py	2012-02-12 16:31:19 +0000
@@ -542,6 +542,12 @@
         """
         return unicode(self.get_state("//SearchBar")[0]['search_string'])
 
+    def searchbar_has_focus(self):
+        """
+        Returns True if the search bar has the key focus, False otherwise.
+        """
+        return self.get_state("//SearchBar")[0]['has_focus']
+
     def get_current_lens(self):
         """Returns the id of the current lens.
 

=== modified file 'tests/autopilot/autopilot/tests/test_dash.py'
--- tests/autopilot/autopilot/tests/test_dash.py	2012-02-07 22:20:45 +0000
+++ tests/autopilot/autopilot/tests/test_dash.py	2012-02-12 16:31:19 +0000
@@ -134,8 +134,22 @@
 
           category = self.dash.get_focused_category()
           self.assertEqual(category, None)
-          
-          
+
+    def test_backward_keynav(self):
+        """Test that the backward keyboard navigation works well."""
+        self.dash.ensure_hidden()
+        self.dash.reveal_application_lens()
+        kb = Keyboard()
+
+        # Moves the key focus to the lensbar
+        for i in range(self.dash.get_num_rows()):
+          kb.press_and_release("Down")
+        self.assertIsNot(self.dash.get_focused_lens_icon(), '')
+
+        # backward key navigation...
+        for i in range(self.dash.get_num_rows()):
+          kb.press_and_release("Up")
+        self.assertTrue(self.dash.searchbar_has_focus())