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::SetLayout to handle empty layouts
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
control
/
control-data-impl.cpp
diff --git
a/dali-toolkit/internal/controls/control/control-data-impl.cpp
b/dali-toolkit/internal/controls/control/control-data-impl.cpp
index
73769c8
..
a6d30d9
100755
(executable)
--- a/
dali-toolkit/internal/controls/control/control-data-impl.cpp
+++ b/
dali-toolkit/internal/controls/control/control-data-impl.cpp
@@
-1442,6
+1442,15
@@
void Control::Impl::SetLayout( Toolkit::Internal::LayoutItem& layout )
mLayout->Initialize( controlHandle, controlHandle.GetTypeName() ); // LayoutGroup takes ownership of existing children
}
mLayout->Initialize( controlHandle, controlHandle.GetTypeName() ); // LayoutGroup takes ownership of existing children
}
+void Control::Impl::RemoveLayout()
+{
+ if( mLayout )
+ {
+ mLayout->Unparent();
+ mLayout.Reset();
+ }
+}
+
} // namespace Internal
} // namespace Toolkit
} // namespace Internal
} // namespace Toolkit