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
Remove OnControl methods & add up-calls
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
popup
/
popup-impl.cpp
diff --git
a/dali-toolkit/internal/controls/popup/popup-impl.cpp
b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index
4a260c5
..
de35289
100755
(executable)
--- a/
dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/
dali-toolkit/internal/controls/popup/popup-impl.cpp
@@
-1506,14
+1506,18
@@
bool Popup::OnDialogTouched(Actor actor, const TouchEvent& event)
return true;
}
return true;
}
-void Popup::On
ControlStageConnection(
)
+void Popup::On
StageConnection( int depth
)
{
{
+ Control::OnStageConnection( depth );
+
mLayoutDirty = true;
RelayoutRequest();
}
mLayoutDirty = true;
RelayoutRequest();
}
-void Popup::OnC
ontrolC
hildAdd( Actor& child )
+void Popup::OnChildAdd( Actor& child )
{
{
+ Control::OnChildAdd( child );
+
// Re-parent any children added by user to the body layer.
if( mAlterAddedChild )
{
// Re-parent any children added by user to the body layer.
if( mAlterAddedChild )
{