Merge lp:~azzar1/nux/fix-916088 into lp:nux/2.0

[Andrea Azzarone]

Fixes a crash. Make check is ok.

[Jay Taoko (jaytaoko)]

review: Approve

[lp:~azzar1/nux/fix-916088]

538. By Andrea Azzarone on 2012-01-20

Merge trunk.

539. By Andrea Azzarone on 2012-01-20

Merge trunk.

540. By Andrea Azzarone on 2012-01-20

Ooops.

541. By Andrea Azzarone on 2012-01-20

Fixes

[Jay Taoko (jaytaoko)]

review: Approve

=== modified file 'Nux/GridHLayout.cpp'
--- Nux/GridHLayout.cpp	2012-01-17 04:34:19 +0000
+++ Nux/GridHLayout.cpp	2012-01-20 22:20:31 +0000
@@ -80,6 +80,7 @@
     {
       if ((*it) == child)
         break;
+      ++position;
     }
 
     return position;
@@ -93,7 +94,9 @@
     {
       if (position == pos)
         return (*it);
-    }   
+
+      ++position;
+    }
 
     return NULL;
   }
@@ -618,25 +621,13 @@
         return NULL;
       }
 
-      if ((direction == KEY_NAV_LEFT) && ((position % nun_column) == 0))
-      {
-        // Left edge
-        return NULL;
-      }
-
-      if ((direction == KEY_NAV_RIGHT) && (position == (position / nun_column) * nun_column + (nun_column -1)))
-      {
-        // right edge
-        return NULL;
-      }
-
       if ((direction == KEY_NAV_UP) && ((position / nun_column) == 0))
       {
         // top edge
         return NULL;
       }
 
-      if ((direction == KEY_NAV_DOWN) && ((position / nun_column) == nun_row))
+      if ((direction == KEY_NAV_DOWN) && ((position / nun_column) == (nun_row - 1)))
       {
         // bottom edge
         return NULL;
@@ -668,12 +659,12 @@
 
         while (key_nav_focus == NULL)
         {
-          ++it;
           int pos = GetChildPos(*it);
 
           if ((it == _layout_element_list.end()) || (pos == (pos / nun_column) * nun_column + (nun_column -1)))
             break;
 
+          ++it;
           key_nav_focus = (*it)->KeyNavIteration(direction);
         }
 
@@ -686,7 +677,9 @@
         {
           --it;
         }
-        return (*it)->KeyNavIteration(direction);
+
+        if (it != _layout_element_list.end())
+          return (*it)->KeyNavIteration(direction);
       }
 
       if (direction == KEY_NAV_DOWN)
@@ -694,10 +687,10 @@
         for (int i = 0; i < nun_column; ++i)
         {
           ++it;
-          if (it == _layout_element_list.end())
-            return NULL;
         }
-        return (*it)->KeyNavIteration(direction);
+
+        if (it != _layout_element_list.end())
+          return (*it)->KeyNavIteration(direction);
       }
     }
     else