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
Changed control defaults to listen to style change
[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
4cb2ec6
..
851945d
100644
(file)
--- a/
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
+++ b/
dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp
@@
-21,7
+21,7
@@
// EXTERNAL INCLUDES
#include <dali/public-api/animation/constraints.h>
#include <dali/public-api/object/type-registry.h>
// EXTERNAL INCLUDES
#include <dali/public-api/animation/constraints.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/
devel
-api/object/type-registry-helper.h>
+#include <dali/
public
-api/object/type-registry-helper.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/alignment/alignment.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/alignment/alignment.h>
@@
-275,7
+275,7
@@
void ToolBar::RemoveControl( Actor control )
}
ToolBar::ToolBar()
}
ToolBar::ToolBar()
-: Control( ControlBehaviour(
ACTOR_BEHAVIOUR_NONE
) ),
+: Control( ControlBehaviour(
CONTROL_BEHAVIOUR_DEFAULT
) ),
mLayout(),
mLeftOffset( 0 ),
mCenterBase( 1 ),
mLayout(),
mLeftOffset( 0 ),
mCenterBase( 1 ),