Merge lp:~apinheiro/nux/Bug734803 into lp:nux

[Alejandro Piñeiro]

See bug 734803 for more information

[lp:~apinheiro/nux/Bug734803]

289. By Jason Smith on 2011-03-21

merge hide cleanup branch

[Neil J. Patel (njpatel)]

Approved.

review: Approve

[lp:~apinheiro/nux/Bug734803]

290. By Alejandro Piñeiro on 2011-03-22

Added child addition/removal signals on Layout and View

=== modified file 'Nux/Layout.cpp'
--- Nux/Layout.cpp	2011-03-17 15:01:12 +0000
+++ Nux/Layout.cpp	2011-03-22 11:48:47 +0000
@@ -90,6 +90,9 @@
 
     if (it != _layout_element_list.end())
     {
+      /* we need to emit the signal before the unparent, just in case
+         one of the callbacks wanted to use this object */
+      ViewRemoved.emit (this, bo);
       bo->UnParentObject();
       _layout_element_list.erase (it);
     }
@@ -279,6 +282,7 @@
     _layout_element_list.push_back (bo);
     _connection_map[bo] = bo->ChildFocusChanged.connect (sigc::mem_fun (this, &Layout::OnChildFocusChanged));
 
+    ViewAdded.emit (this, bo);
     //--->> Removed because it cause problem with The splitter widget: ComputeLayout2();
   }
 

=== modified file 'Nux/Layout.h'
--- Nux/Layout.h	2011-03-16 15:58:52 +0000
+++ Nux/Layout.h	2011-03-22 11:48:47 +0000
@@ -223,6 +223,8 @@
 
     sigc::signal<void, Layout*> OnQueueDraw;  //!< Signal emitted when a layout is scheduled for a draw.
     sigc::signal<void, Area*>   OnChildQueueDraw;
+    sigc::signal<void, Layout*, Area*> ViewAdded;
+    sigc::signal<void, Layout*, Area*> ViewRemoved;
 
     virtual void DoSetFocused (bool focused);
     virtual bool DoGetFocused ();

=== modified file 'Nux/View.cpp'
--- Nux/View.cpp	2011-03-17 15:01:27 +0000
+++ Nux/View.cpp	2011-03-22 11:48:47 +0000
@@ -386,6 +386,11 @@
         m_CompositionLayout->SetFocused (false);
 
       _on_focus_changed_handler.disconnect ();
+
+      /* we need to emit the signal before the unparent, just in case
+         one of the callbacks wanted to use this object */
+
+      LayoutRemoved.emit (this, m_CompositionLayout);
       m_CompositionLayout->UnParentObject();
     }
     layout->SetParentObject (this);
@@ -396,6 +401,9 @@
       layout->SetFocused (true);
 
     _on_focus_changed_handler = layout->ChildFocusChanged.connect (sigc::mem_fun (this, &View::OnChildFocusChanged));
+
+    LayoutAdded.emit (this, m_CompositionLayout);
+
     return true;
   }
 

=== modified file 'Nux/View.h'
--- Nux/View.h	2011-03-17 14:47:06 +0000
+++ Nux/View.h	2011-03-22 11:48:47 +0000
@@ -168,6 +168,9 @@
     */
     virtual bool SetLayout (Layout *layout);
 
+    sigc::signal<void, View*, Layout*> LayoutAdded;
+    sigc::signal<void, View*, Layout*> LayoutRemoved;
+
     void SetFont(ObjectPtr<FontTexture> font);
     ObjectPtr<FontTexture> GetFont();