projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged with Tizen Branch ( builds )
[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
207ffe6
..
a0ca86e
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,16
+19,15
@@
#include "tool-bar-impl.h"
// EXTERNAL INCLUDES
#include "tool-bar-impl.h"
// EXTERNAL INCLUDES
-#include <dali/public-api/actors/
renderabl
e-actor.h>
+#include <dali/public-api/actors/
imag
e-actor.h>
#include <dali/public-api/animation/constraints.h>
#include <dali/public-api/object/type-registry.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>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/alignment/alignment.h>
#include <dali-toolkit/public-api/controls/table-view/table-view.h>
-// EXTERNAL INCLUDES
-
namespace Dali
{
namespace Dali
{
@@
-40,12
+39,14
@@
namespace Internal
namespace
{
namespace
{
+
BaseHandle Create()
{
return Toolkit::ToolBar::New();
}
BaseHandle Create()
{
return Toolkit::ToolBar::New();
}
-TypeRegistration mType( typeid(Toolkit::ToolBar), typeid(Toolkit::Control), Create );
+DALI_TYPE_REGISTRATION_BEGIN( Toolkit::ToolBar, Toolkit::Control, Create )
+DALI_TYPE_REGISTRATION_END()
const float DEFAULT_RELATIVE_SIZE( 0.1f );
const Toolkit::Alignment::Type DEFAULT_ALIGNMENT( Toolkit::Alignment::HorizontalLeft );
const float DEFAULT_RELATIVE_SIZE( 0.1f );
const Toolkit::Alignment::Type DEFAULT_ALIGNMENT( Toolkit::Alignment::HorizontalLeft );
@@
-56,7
+57,7
@@
Toolkit::ToolBar ToolBar::New()
// Create the implementation, temporarily owned on stack
IntrusivePtr< ToolBar > internalToolBar = new ToolBar();
// 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
Toolkit::ToolBar toolBar( *internalToolBar );
// Second-phase init of the implementation
@@
-73,9
+74,9
@@
void ToolBar::SetBackground( Actor background )
// ToolBar image
background.SetParentOrigin( Dali::ParentOrigin::TOP_CENTER );
background.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
// ToolBar image
background.SetParentOrigin( Dali::ParentOrigin::TOP_CENTER );
background.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
- background.SetSize(
mToolBarSize
);
+ background.SetSize(
Vector2( mToolBarSize.width, mToolBarSize.height )
);
-
RenderableActor renderableActor = Renderabl
eActor::DownCast( background );
+
ImageActor renderableActor = Imag
eActor::DownCast( background );
if ( renderableActor )
{
renderableActor.SetSortModifier( 1.f );
if ( renderableActor )
{
renderableActor.SetSortModifier( 1.f );
@@
-124,8
+125,9
@@
void ToolBar::AddControl( Actor control, float relativeSize, Toolkit::Alignment:
// Create an alignment container where to place the control.
Toolkit::Alignment alignmentContainer = Toolkit::Alignment::New( alignment );
// Create an alignment container where to place the control.
Toolkit::Alignment alignmentContainer = Toolkit::Alignment::New( alignment );
- alignmentContainer.SetS
caling( Toolkit::Alignment::ScaleToFill
);
+ alignmentContainer.SetS
izeScalePolicy( SizeScalePolicy::FIT_WITH_ASPECT_RATIO
);
alignmentContainer.SetPadding( padding );
alignmentContainer.SetPadding( padding );
+ alignmentContainer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
alignmentContainer.Add( control );
// Insert the control in the table view.
alignmentContainer.Add( control );
// Insert the control in the table view.
@@
-294,7
+296,7
@@
void ToolBar::RemoveControl( Actor control )
}
ToolBar::ToolBar()
}
ToolBar::ToolBar()
-: Control( C
ONTROL_BEHAVIOUR_NONE
),
+: Control( C
ontrolBehaviour( ACTOR_BEHAVIOUR_NONE )
),
mLayout(),
mLeftOffset( 0 ),
mCenterBase( 1 ),
mLayout(),
mLeftOffset( 0 ),
mCenterBase( 1 ),
@@
-319,6
+321,8
@@
void ToolBar::OnInitialize()
// Layout
mLayout = Toolkit::TableView::New( 1, 1 );
// Layout
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 );
Self().Add( mLayout );
mLayout.SetPositionInheritanceMode( Dali::USE_PARENT_POSITION );
Self().Add( mLayout );
@@
-355,7
+359,7
@@
void ToolBar::OnControlChildAdd(Actor& child)
void ToolBar::OnControlSizeSet( const Vector3& targetSize )
{
mToolBarSize = targetSize;
void ToolBar::OnControlSizeSet( const Vector3& targetSize )
{
mToolBarSize = targetSize;
- mBackground.SetSize(
mToolBarSize
);
+ mBackground.SetSize(
Vector2( mToolBarSize.width, mToolBarSize.height )
);
}
} // namespace Internal
}
} // namespace Internal