Remove OnControl methods & add up-calls

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / tool-bar / tool-bar-impl.cpp

diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
index 4d7a077..4cb2ec6 100644 (file)
--- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
@@ -19,7 +19,6 @@
 #include "tool-bar-impl.h"
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/renderable-actor.h>
 #include <dali/public-api/animation/constraints.h>
 #include <dali/public-api/object/type-registry.h>
 #include <dali/devel-api/object/type-registry-helper.h>
@@ -66,25 +65,6 @@ Toolkit::ToolBar ToolBar::New()
   return toolBar;
 }
 
-void ToolBar::SetBackground( Actor background )
-{
-  Lock lock( mInitializing );
-
-  // ToolBar image
-  background.SetParentOrigin( Dali::ParentOrigin::TOP_CENTER );
-  background.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
-  background.SetSize( Vector2( mToolBarSize.width, mToolBarSize.height ) );
-
-  RenderableActor renderableActor = RenderableActor::DownCast( background );
-  if ( renderableActor )
-  {
-    renderableActor.SetSortModifier( 1.f );
-  }
-
-  Self().Add( background );
-  mBackground = background;
-}
-
 void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment::Type alignment, const Toolkit::Alignment::Padding& padding )
 {
   // Work out index and update bases and offsets for further insertions.
@@ -322,7 +302,7 @@ void ToolBar::OnInitialize()
   mLayout = Toolkit::TableView::New( 1, 1 );
   mLayout.SetName( "TOOLBAR_LAYOUT" );
   mLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
-  mLayout.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
+  mLayout.SetParentOrigin( ParentOrigin::CENTER );
 
   Self().Add( mLayout );
 
@@ -335,8 +315,10 @@ void ToolBar::OnInitialize()
   mLayout.SetRelativeWidth( 1, mRightRelativeSpace );
 }
 
-void ToolBar::OnControlChildAdd(Actor& child)
+void ToolBar::OnChildAdd(Actor& child)
 {
+  Control::OnChildAdd( child );
+
   if( !mInitializing )
   {
     // An actor is being added through the Actor's API.
@@ -350,17 +332,11 @@ void ToolBar::OnControlChildAdd(Actor& child)
     AddControl( child, DEFAULT_RELATIVE_SIZE, DEFAULT_ALIGNMENT, Toolkit::ToolBar::DEFAULT_PADDING );
   }
 
-  // No OnControlChildRemove method required because Actors are added to the mLayout table view, so if an
+  // No OnChildRemove method required because Actors are added to the mLayout table view, so if an
   // actor is removed using the Actor::RemoveChild method it will not remove anything because the
   // actor is in mLayout not in Self().
 }
 
-void ToolBar::OnControlSizeSet( const Vector3& targetSize )
-{
-  mToolBarSize = targetSize;
-  mBackground.SetSize( Vector2( mToolBarSize.width, mToolBarSize.height ) );
-}
-
 } // namespace Internal
 
 } // namespace Toolkit