Merge lp:~gordallott/nux/nux-fixes-07-04 into lp:nux

[Gord Allott]

fixes some bugs, attached

[Jay Taoko (jaytaoko)]

Shouldn't the same thing be done for GridVLayout?

Approved

review: Approve

=== modified file 'Nux/Focusable.cpp'
--- Nux/Focusable.cpp	2011-03-23 06:46:46 +0000
+++ Nux/Focusable.cpp	2011-04-07 13:47:29 +0000
@@ -53,6 +53,7 @@
       switch (keysym)
       {
         case NUX_VK_ENTER:
+        case NUX_KP_ENTER:
           type = FOCUS_EVENT_ACTIVATE;
           //g_debug ("focus key activated");
           break;

=== modified file 'Nux/GridHLayout.cpp'
--- Nux/GridHLayout.cpp	2011-04-06 21:54:09 +0000
+++ Nux/GridHLayout.cpp	2011-04-07 13:47:29 +0000
@@ -97,6 +97,33 @@
     return NULL;
   }
 
+  long GridHLayout::DoFocusNext (IEvent &ievent, long TraverseInfo, long ProcessEventInfo)
+  {
+    Area *parent = GetParentObject ();
+    if (parent != NULL)
+      {
+         return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
+    	}
+    else
+		{
+      Layout::DoFocusNext (ievent, TraverseInfo, ProcessEventInfo);
+		}
+		
+    return ProcessEventInfo;
+  }
+
+  long GridHLayout::DoFocusPrev (IEvent &ievent, long TraverseInfo, long ProcessEventInfo)
+  {
+    Area *parent = GetParentObject ();
+    if (parent != NULL)
+      return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
+    else
+      Layout::DoFocusPrev (ievent, TraverseInfo, ProcessEventInfo);
+
+    return ProcessEventInfo;
+  }
+
+
   long GridHLayout::DoFocusLeft (IEvent &ievent, long TraverseInfo, long ProcessEventInfo)
   {
     // if we are left on an edge, then send up
@@ -106,13 +133,12 @@
 
     if (parent == NULL || position % GetNumColumn ())
     {
-      return Layout::DoFocusLeft (ievent, TraverseInfo, ProcessEventInfo);
-    }
-    else
-    {
-      // left edge
-      return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
-    }
+      //inside container
+      return Layout::DoFocusPrev (ievent, TraverseInfo, ProcessEventInfo);
+    }
+
+    
+    return TraverseInfo;
   }
 
   long GridHLayout::DoFocusRight (IEvent &ievent, long TraverseInfo, long ProcessEventInfo)
@@ -124,13 +150,11 @@
 
     if (parent == NULL || (position + 1) % GetNumColumn ())
     {
-      return Layout::DoFocusRight (ievent, TraverseInfo, ProcessEventInfo);
-    }
-    else
-    {
-      // Right Edge
-      return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
-    }
+      // inside container
+      return Layout::DoFocusNext (ievent, TraverseInfo, ProcessEventInfo);
+    }
+    
+    return TraverseInfo;
   }
 
   //up and down should pass event to parent
@@ -139,34 +163,25 @@
     Area* focused_child = GetFocusedChild ();
     int position = GetChildPos (focused_child);
     Area *parent = GetParentObject ();
-    
-    if (focused_child == NULL || position < GetNumColumn ())
+    if (focused_child == NULL)
     {
-      
       if (parent != NULL)
+      {
         return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
+      }
       else
         FocusFirstChild ();
-
     }
     else
     {
       // so hacky, but its cheap!
       // just focus the child position - numcolumns
-      //focused_child->SetFocused (false);
       focused_child = GetChildAtPosition (position - GetNumColumn ());
       if (focused_child)
       {
         focused_child->SetFocused (true);
         ChildFocusChanged.emit (this, focused_child);
       }
-      else
-      {
-        if (parent != NULL)
-          return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
-        else
-          FocusFirstChild ();
-      }
     }
 
     return TraverseInfo;
@@ -177,7 +192,7 @@
     int position = GetChildPos (focused_child);
     Area *parent = GetParentObject ();
     
-    if (focused_child == NULL || position > GetNumColumn () * (GetNumRow () - 1))
+    if (focused_child == NULL)
     {
       if (parent != NULL)
         return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
@@ -188,20 +203,12 @@
     {
       // so hacky, but its cheap!
       // just focus the child position - numcolumns
-      //focused_child->SetFocused (false);
       focused_child = GetChildAtPosition (position + GetNumColumn ());
       if (focused_child)
       {
         focused_child->SetFocused (true);
         ChildFocusChanged.emit (this, focused_child);
       }
-      else
-      {
-        if (parent != NULL)
-          return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
-        else
-          FocusLastChild ();
-      }
     }
 
     return TraverseInfo;

=== modified file 'Nux/GridHLayout.h'
--- Nux/GridHLayout.h	2011-04-06 21:54:09 +0000
+++ Nux/GridHLayout.h	2011-04-07 13:47:29 +0000
@@ -107,8 +107,10 @@
   protected:
     int GetChildPos (Area *child);
     Area* GetChildAtPosition (int pos);
-    virtual long DoFocusUp  (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
-    virtual long DoFocusDown (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
+    virtual long DoFocusNext  (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
+    virtual long DoFocusPrev  (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
+    virtual long DoFocusUp    (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
+    virtual long DoFocusDown  (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
     virtual long DoFocusLeft  (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
     virtual long DoFocusRight (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
     

=== modified file 'Nux/TextEntry.cpp'
--- Nux/TextEntry.cpp	2011-04-07 11:01:32 +0000
+++ Nux/TextEntry.cpp	2011-04-07 13:47:29 +0000
@@ -374,7 +374,7 @@
     if (keysym == NUX_VK_TAB)
       return;
 
-    if (keysym == NUX_VK_ENTER)
+    if (keysym == NUX_VK_ENTER || NUX_KP_ENTER)
     {
       activated.emit ();
       return;