#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/public-api/object/type-registry-helper.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/alignment/alignment.h>
-#include <dali-toolkit/public-api/controls/table-view/table-view.h>
namespace Dali
{
// Create the implementation, temporarily owned on stack
IntrusivePtr< ToolBar > internalToolBar = new ToolBar();
- // Pass ownership to Toolkit::View
+ // Pass ownership to Toolkit::Toolbar
Toolkit::ToolBar toolBar( *internalToolBar );
// Second-phase init of the implementation
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( mToolBarSize );
-
- 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.
// Create an alignment container where to place the control.
Toolkit::Alignment alignmentContainer = Toolkit::Alignment::New( alignment );
- alignmentContainer.SetScaling( Toolkit::Alignment::ScaleToFill );
+ alignmentContainer.SetSizeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO );
alignmentContainer.SetPadding( padding );
+ alignmentContainer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
alignmentContainer.Add( control );
// Insert the control in the table view.
}
ToolBar::ToolBar()
-: Control( CONTROL_BEHAVIOUR_NONE ),
+: Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ),
mLayout(),
mLeftOffset( 0 ),
mCenterBase( 1 ),
// Layout
mLayout = Toolkit::TableView::New( 1, 1 );
- mLayout.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
+ mLayout.SetName( "TOOLBAR_LAYOUT" );
+ mLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+ mLayout.SetParentOrigin( ParentOrigin::CENTER );
Self().Add( mLayout );
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.
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( mToolBarSize );
-}
-
} // namespace Internal
} // namespace Toolkit