Merge lp:~azzar1/nux/hgrid-kn-update into lp:nux/2.0

[Andrea Azzarone]

Update the hgrid keyboard navigation.

[Jason Smith (jassmith)]

Looks good

review: Approve

=== modified file 'Nux/GridHLayout.cpp'
--- Nux/GridHLayout.cpp	2012-01-20 22:15:09 +0000
+++ Nux/GridHLayout.cpp	2012-02-13 11:26:18 +0000
@@ -615,12 +615,23 @@
         return NULL;
       }
 
+      if ((direction == KEY_NAV_LEFT) && position % nun_column == 0)
+      {
+        return NULL;
+      }
+
       if ((direction == KEY_NAV_RIGHT) && (it_next == _layout_element_list.end()))
       {
         // last item
         return NULL;
       }
 
+      if ((direction == KEY_NAV_RIGHT) && position % nun_column == nun_column - 1)
+      {
+        // last item
+        return NULL;
+      }
+
       if ((direction == KEY_NAV_UP) && ((position / nun_column) == 0))
       {
         // top edge

=== modified file 'tests/xtest-hgrid-key-navigation.cpp'
--- tests/xtest-hgrid-key-navigation.cpp	2012-01-27 22:37:13 +0000
+++ tests/xtest-hgrid-key-navigation.cpp	2012-02-13 11:26:18 +0000
@@ -119,7 +119,7 @@
 
 
   // Rigth key
-  for (int i=0; i<10; ++i)
+  for (int i=0; i<3; ++i)
   {
     test.SendFakeKeyEvent(XK_Right, 0);
     nux::SleepForMilliseconds(500);
@@ -130,10 +130,10 @@
   // Another right key, should do nothing
   test.SendFakeKeyEvent(XK_Right, 0);
   nux::SleepForMilliseconds(500);
-  test.TestReportMsg(key_navigation_test->tiles_[10]->has_focus_, "Right key, last element");
+  test.TestReportMsg(key_navigation_test->tiles_[3]->has_focus_, "Right key, last element");
   
   // Left key
-  for (int i=10; i>0; --i)
+  for (int i=3; i>0; --i)
   {
     test.SendFakeKeyEvent(XK_Left, 0);
     nux::SleepForMilliseconds(500);