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
Merge "Add FittingMode for image" into devel/master
[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
441b640
..
1c95686
100644
(file)
--- a/
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
+++ b/
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
@@
-300,9
+300,9
@@
void ToolBar::OnInitialize()
// Layout
mLayout = Toolkit::TableView::New( 1, 1 );
// Layout
mLayout = Toolkit::TableView::New( 1, 1 );
- mLayout.Set
Name(
"TOOLBAR_LAYOUT" );
+ mLayout.Set
Property( Dali::Actor::Property::NAME,
"TOOLBAR_LAYOUT" );
mLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
mLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
- mLayout.SetP
arentOrigin(
ParentOrigin::CENTER );
+ mLayout.SetP
roperty( Actor::Property::PARENT_ORIGIN,
ParentOrigin::CENTER );
Self().Add( mLayout );
Self().Add( mLayout );