Merge lp:~gordallott/nux/nux-keynav-fixes-17-03-11 into lp:nux

[Gord Allott]

linked bugs, some keynav fixes

[Jay Taoko (jaytaoko)]

Approved

review: Approve

=== modified file 'Nux/Area.cpp'
--- Nux/Area.cpp	2011-03-17 00:27:16 +0000
+++ Nux/Area.cpp	2011-03-17 10:13:29 +0000
@@ -825,7 +825,7 @@
   {
     if (_is_focused == focused)
       return;
-
+    
     _is_focused = focused;
     FocusChanged.emit (this);
   }
 
=== modified file 'Nux/Area.h'
--- Nux/Area.h	2011-03-17 00:27:16 +0000
+++ Nux/Area.h	2011-03-17 10:13:29 +0000
@@ -23,6 +23,7 @@
 #ifndef BASEOBJECT_H
 #define BASEOBJECT_H
 
+#include <sigc++/sigc++.h>
 #include "NuxCore/InitiallyUnownedObject.h"
 #include "Focusable.h"
 #include "Utils.h"
@@ -31,6 +32,7 @@
 
 
 
+
 namespace nux
 {
   class WindowThread;
@@ -297,6 +299,7 @@
     
     sigc::signal <void, Area *> FocusActivated;
     sigc::signal <void, Area *> FocusChanged;
+    sigc::signal <void, Area*, Area*> ChildFocusChanged; // sends parent + child
 
     //! Queue a relayout
     /*!
 
=== modified file 'Nux/GridHLayout.cpp'
--- Nux/GridHLayout.cpp	2011-03-10 13:03:38 +0000
+++ Nux/GridHLayout.cpp	2011-03-17 10:13:29 +0000
@@ -97,17 +97,56 @@
     return NULL;
   }
 
+  long GridHLayout::DoFocusLeft (IEvent &ievent, long TraverseInfo, long ProcessEventInfo)
+  {
+    // if we are left on an edge, then send up
+    Area* focused_child = GetFocusedChild ();
+    int position = GetChildPos (focused_child);
+    Area *parent = GetParentObject ();
+
+    if (parent == NULL || position % GetNumColumn ())
+    {
+      return Layout::DoFocusLeft (ievent, TraverseInfo, ProcessEventInfo);
+    }
+    else
+    {
+      // left edge
+      return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
+    }
+  }
+
+  long GridHLayout::DoFocusRight (IEvent &ievent, long TraverseInfo, long ProcessEventInfo)
+  {
+    // if we are left on an edge, then send up
+    Area* focused_child = GetFocusedChild ();
+    int position = GetChildPos (focused_child);
+    Area *parent = GetParentObject ();
+
+    if (parent == NULL || (position + 1) % GetNumColumn ())
+    {
+      return Layout::DoFocusRight (ievent, TraverseInfo, ProcessEventInfo);
+    }
+    else
+    {
+      // Right Edge
+      return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
+    }
+  }
+
   //up and down should pass event to parent
   long GridHLayout::DoFocusUp (IEvent &ievent, long TraverseInfo, long ProcessEventInfo)
   {
     Area* focused_child = GetFocusedChild ();
     int position = GetChildPos (focused_child);
+    Area *parent = GetParentObject ();
     
     if (focused_child == NULL || position < GetNumColumn ())
     {
-      Area *parent = GetParentObject ();
+      
       if (parent != NULL)
         return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
+      else
+        FocusFirstChild ();
 
     }
     else
@@ -117,7 +156,17 @@
       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;
@@ -126,14 +175,14 @@
   {
     Area* focused_child = GetFocusedChild ();
     int position = GetChildPos (focused_child);
+    Area *parent = GetParentObject ();
     
     if (focused_child == NULL || position > GetNumColumn () * (GetNumRow () - 1))
     {
-      Area *parent = GetParentObject ();
       if (parent != NULL)
-      {
         return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
-      }
+      else
+        FocusLastChild ();
     }
     else
     {
@@ -144,10 +193,14 @@
       if (focused_child)
       {
         focused_child->SetFocused (true);
+        ChildFocusChanged.emit (this, focused_child);
       }
       else
       {
-        FocusLastChild ();
+        if (parent != NULL)
+          return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
+        else
+          FocusLastChild ();
       }
     }
 
 
=== modified file 'Nux/GridHLayout.h'
--- Nux/GridHLayout.h	2011-03-09 15:20:56 +0000
+++ Nux/GridHLayout.h	2011-03-17 10:13:29 +0000
@@ -109,8 +109,8 @@
     Area* GetChildAtPosition (int pos);
     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);
+    virtual long DoFocusLeft  (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
+    virtual long DoFocusRight (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
     
   private:
     Size _children_size;
 
=== modified file 'Nux/HLayout.cpp'
--- Nux/HLayout.cpp	2011-03-10 13:03:38 +0000
+++ Nux/HLayout.cpp	2011-03-17 10:13:29 +0000
@@ -71,7 +71,7 @@
     if (parent != NULL)
       return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
     else
-      FocusFirstChild ();
+      FocusPreviousChild (GetFocusedChild ());
 
     return TraverseInfo;
   }
@@ -82,7 +82,7 @@
     if (parent != NULL)
       return SendEventToArea (parent, ievent, TraverseInfo, ProcessEventInfo);
     else
-      FocusFirstChild ();
+      FocusNextChild (GetFocusedChild ());
     return TraverseInfo;
   }
 
 
=== modified file 'Nux/Layout.cpp'
--- Nux/Layout.cpp	2011-03-10 13:03:38 +0000
+++ Nux/Layout.cpp	2011-03-17 10:13:29 +0000
@@ -80,8 +80,13 @@
           FocusNextChild ((*it));
         }
       }
+
+      (*it)->SetFocused (false);
     }
 
+    sigc::connection onchildfocuscon = _connection_map[bo];
+    onchildfocuscon.disconnect ();
+
     if (it != _layout_element_list.end())
     {
       bo->UnParentObject();
@@ -154,6 +159,11 @@
     return false;
   }
 
+  void Layout::OnChildFocusChanged (Area *parent, Area *child)
+  {
+    ChildFocusChanged.emit (parent, child);
+  }
+
 // If(stretchfactor == 0): the WidgetLayout geometry will be set to SetGeometry(0,0,1,1);
 // and the children will take their natural size by expending WidgetLayout.
 // If the parent of WidgetLayout offers more space, it won't be used by WidgetLayout.
@@ -198,6 +208,7 @@
     }
 
     _layout_element_list.push_back (layout);
+    _connection_map[layout] = layout->ChildFocusChanged.connect (sigc::mem_fun (this, &Layout::OnChildFocusChanged));
 
     //--->> Removed because it cause problem with The splitter widget: ComputeLayout2();
   }
@@ -265,6 +276,7 @@
 
 
     _layout_element_list.push_back (bo);
+    _connection_map[bo] = bo->ChildFocusChanged.connect (sigc::mem_fun (this, &Layout::OnChildFocusChanged));
 
     //--->> Removed because it cause problem with The splitter widget: ComputeLayout2();
   }
@@ -512,7 +524,6 @@
       return 0;
     }
 
-
     long ret = 0;
     if ( area->IsView() )
     {
 
=== modified file 'Nux/Layout.h'
--- Nux/Layout.h	2011-03-10 12:12:07 +0000
+++ Nux/Layout.h	2011-03-17 10:13:29 +0000
@@ -231,8 +231,6 @@
 
     bool HasFocusableEntries ();
 
-    sigc::signal <void, Layout *, Area*> ChildFocusChanged;
-
     // this should not be public, but has to be because of nux's object setup
     long ProcessFocusEvent (IEvent &ievent, long TraverseInfo, long ProcessEventInfo);
     bool _has_focus_control;
@@ -252,8 +250,9 @@
     virtual bool FocusLastChild ();
     virtual bool FocusNextChild (Area *child);
     virtual bool FocusPreviousChild (Area *child);
-    
-    
+    void OnChildFocusChanged (Area *parent, Area *child);
+    
+    std::map<Area*, sigc::connection> _connection_map; // map our children to connections
     
     bool _queued_draw; //<! The rendering of the layout needs to be refreshed.
 
 
=== modified file 'Nux/ScrollView.cpp'
--- Nux/ScrollView.cpp	2011-03-04 16:42:15 +0000
+++ Nux/ScrollView.cpp	2011-03-17 10:13:29 +0000
@@ -66,6 +66,8 @@
     m_ViewContentBottomMargin    = 0;
     FormatContent();
 
+    ChildFocusChanged.connect (sigc::mem_fun (this, &ScrollView::OnChildFocusChanged));
+
   }
 
   ScrollView::~ScrollView()
@@ -75,6 +77,45 @@
     vscrollbar->Dispose ();
   }
 
+  void ScrollView::OnChildFocusChanged (Area *parent, Area *child)
+  {
+    if (child->IsView ())
+    {
+      View *view = (View*)child;
+      if (view->HasPassiveFocus ())
+      {
+        return;
+      }
+    }
+    if (child->IsLayout ())
+      return;
+    
+    int child_y = child->GetGeometry ().y - GetGeometry ().y;
+    int child_y_diff = child_y - abs (_delta_y);
+
+    
+    if (child_y_diff + child->GetGeometry ().height < GetGeometry ().height && child_y_diff >= 0)
+    {
+      return;
+    }
+    
+    if (child_y_diff < 0)
+    {
+      ScrollUp (1, abs (child_y_diff));
+    }
+    else
+    {
+      int size = child_y_diff - GetGeometry ().height;
+
+      // always keeps the top of a view on the screen
+      size += (child->GetGeometry ().height, GetGeometry ().height) ? child->GetGeometry ().height : GetGeometry ().height;
+      
+      ScrollDown (1, size);
+    }
+
+  }
+
+
   long ScrollView::ProcessEvent (Event &event, long TraverseInfo, long ProcessEventInfo)
   {
     long ret = TraverseInfo;
 
=== modified file 'Nux/ScrollView.h'
--- Nux/ScrollView.h	2011-03-04 16:42:15 +0000
+++ Nux/ScrollView.h	2011-03-17 10:13:29 +0000
@@ -25,6 +25,7 @@
 
 #include "Nux.h"
 
+
 namespace nux
 {
   class HScrollBar;
@@ -156,6 +157,9 @@
     virtual void PostDraw (GraphicsEngine &GfxContext, bool force_draw);
     virtual long ProcessEvent (Event &event, long TraverseInfo, long ProcessEventInfo);
 
+    void OnChildFocusChanged (Area *parent, Area *child);
+    
+
     // Backup texture to speed up scrolling
     ObjectPtr<IOpenGLFrameBufferObject> m_FrameBufferObject;
 
 
=== modified file 'Nux/View.cpp'
--- Nux/View.cpp	2011-03-17 00:34:40 +0000
+++ Nux/View.cpp	2011-03-17 10:13:29 +0000
@@ -71,8 +71,11 @@
 
     Area *parent = GetParentObject ();
     if (parent == NULL)
+    {
+      GetLayout ()->SetFocused (false);
       GetLayout ()->SetFocused (true); // just reset the layout focus becase we are top level
-
+    }
+    
     if (parent != NULL && parent->IsLayout ())
     {
       Layout *parent_layout = (Layout *)parent;
@@ -262,6 +265,7 @@
       }
     }
 
+// just leave this here, its helpful for debugging focus issues :)
 //     if (GetFocused () && _can_pass_focus_to_composite_layout == false)
 //     {
 //       GetPainter ().Paint2DQuadColor (GfxContext, GetGeometry (), nux::Color (0.2, 1.0, 0.2, 1.0));
@@ -294,7 +298,7 @@
     //GetWindowCompositor()..AddToDrawList(this);
     WindowThread* application = GetWindowThread ();
     if(application)
-    {
+    {       
       application->AddToDrawList(this);
       application->RequestRedraw();
       //GetWindowCompositor().AddToDrawList(this);
@@ -372,8 +376,13 @@
     }
 
     if (m_CompositionLayout)
+    {
+      if (GetFocused ())
+        m_CompositionLayout->SetFocused (false);
+
+      _on_focus_changed_handler.disconnect ();
       m_CompositionLayout->UnParentObject();
-
+    }
     layout->SetParentObject (this);
     m_CompositionLayout = layout;
 
@@ -381,9 +390,16 @@
     if (GetFocused ())
       layout->SetFocused (true);
 
+    _on_focus_changed_handler = layout->ChildFocusChanged.connect (sigc::mem_fun (this, &View::OnChildFocusChanged));
     return true;
   }
 
+  //propogate the signal 
+  void View::OnChildFocusChanged (Area *parent, Area *child)
+  {
+    ChildFocusChanged.emit (parent, child);
+  }
+
   bool View::SetCompositionLayout (Layout *layout)
   {
     return SetLayout (layout);
@@ -542,6 +558,16 @@
     }
   }
 
+  // if we have a layout, returns true if we pass focus to it
+  // else returns false
+  bool View::HasPassiveFocus ()
+  {
+    if (_can_pass_focus_to_composite_layout && GetLayout () != NULL)
+      return true;
+
+    return false;
+  }
+
   void View::SetFocusControl (bool focus_control)
   {
     Area *_parent = GetParentObject ();
 
=== modified file 'Nux/View.h'
--- Nux/View.h	2011-03-17 01:12:20 +0000
+++ Nux/View.h	2011-03-17 10:13:29 +0000
@@ -180,9 +180,17 @@
     void SetFocusControl (bool focus_control);
     bool HasFocusControl ();
 
+    /*
+        Returns true if the view has a layout and passes focus to that layout
+    */
+    bool HasPassiveFocus ();
+
   protected:
     bool _can_focus;
 
+    void OnChildFocusChanged (Area *parent, Area *child);
+    sigc::connection _on_focus_changed_handler;
+
     virtual long ProcessEvent (IEvent &ievent, long TraverseInfo, long ProcessEventInfo) = 0;
     virtual void Draw (GraphicsEngine &GfxContext, bool force_draw) = 0;
     virtual void DrawContent (GraphicsEngine &GfxContext, bool force_draw);
 
=== modified file 'examples/focus.cpp'
--- examples/focus.cpp	2011-03-10 12:12:07 +0000
+++ examples/focus.cpp	2011-03-17 10:13:29 +0000
@@ -37,7 +37,7 @@
   return ((float)rand ()) / RAND_MAX;
 }
 
-static void OnFocusChildChanged (nux::Layout *layout, nux::Area *view)
+static void OnFocusChildChanged (nux::Area *layout, nux::Area *view)
 {
   g_debug ("focus has changed, woo %i", rand ());
 }
@@ -77,11 +77,18 @@
   nux::VLayout* layout_scroll_container = new nux::VLayout (NUX_TRACKER_LOCATION);
   
   nux::VLayout* layout_scroll_1  = new nux::VLayout(NUX_TRACKER_LOCATION);
+
+
   nux::HLayout* layout_scroll_11 = new nux::HLayout(NUX_TRACKER_LOCATION);
-  nux::GridHLayout* layout_scroll_12 = new nux::GridHLayout (NUX_TRACKER_LOCATION);
+  nux::ScrollView *layout_scroll_12 = new nux::ScrollView (NUX_TRACKER_LOCATION);
+  nux::GridHLayout* layout_scroll_12_content = new nux::GridHLayout (NUX_TRACKER_LOCATION);
+  layout_scroll_12->EnableHorizontalScrollBar (false);
+  layout_scroll_12->EnableVerticalScrollBar (true);
+  layout_scroll_12->SetLayout (layout_scroll_12_content);
+  
 
   layout_scroll_1->AddLayout (layout_scroll_11, 0, nux::MINOR_POSITION_TOP);
-  layout_scroll_1->AddLayout (layout_scroll_12, 1, nux::MINOR_POSITION_TOP);
+  layout_scroll_1->AddView (layout_scroll_12, 1, nux::MINOR_POSITION_TOP);
   
   nux::VLayout* layout_scroll_2  = new nux::VLayout(NUX_TRACKER_LOCATION);
   nux::HLayout* layout_scroll_21 = new nux::HLayout(NUX_TRACKER_LOCATION);
@@ -124,14 +131,14 @@
     layout_scroll_11->AddView (texture_area, 1, nux::eLeft, nux::eFull);
   }
 
-  for (int i = 0; i < 16; i++)
+  for (int i = 0; i < 128; i++)
   {
     nux::ColorLayer color (nux::Color (0.2, 0.2, 0.4+ frand ()*0.3, 1.0));
     nux::TextureArea* texture_area = new nux::TextureArea ();
     texture_area->SetPaintLayer (&color);
     texture_area->FocusChanged.connect (sigc::ptr_fun (&OnFocusChanged));
     //~ //~
-    layout_scroll_12->AddView (texture_area, 1, nux::eLeft, nux::eFull);
+    layout_scroll_12_content->AddView (texture_area, 1, nux::eLeft, nux::eFull);
   }
 
   for (int i = 0; i < 6; i++)