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
Layout removal support
[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
fcfb147
..
c5af35e
100755
(executable)
--- a/
dali-toolkit/internal/controls/control/control-data-impl.cpp
+++ b/
dali-toolkit/internal/controls/control/control-data-impl.cpp
@@
-36,6
+36,7
@@
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <dali-toolkit/devel-api/controls/control-wrapper-impl.h>
#include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
#include <dali-toolkit/devel-api/controls/control-devel.h>
#include <dali-toolkit/devel-api/controls/control-wrapper-impl.h>
+#include <dali-toolkit/devel-api/layouting/bin-layout.h>
#include <dali-toolkit/devel-api/layouting/layout-item.h>
#include <dali-toolkit/internal/styling/style-manager-impl.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
#include <dali-toolkit/devel-api/layouting/layout-item.h>
#include <dali-toolkit/internal/styling/style-manager-impl.h>
#include <dali-toolkit/internal/visuals/visual-string-constants.h>
@@
-1457,12
+1458,11
@@
void Control::Impl::SetLayout( Toolkit::Internal::LayoutItem& layout )
void Control::Impl::RemoveLayout()
{
void Control::Impl::RemoveLayout()
{
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::Impl::RemoveLayout\n");
- if( mLayout )
- {
- mLayout->Unparent();
- mLayout.Reset();
- }
+ DALI_LOG_INFO( gLogFilterLayout, Debug::Verbose, "Control::Impl::RemoveLayout\n");
+
+ Toolkit::BinLayout binLayout = Toolkit::BinLayout::New();
+
+ mControlImpl.mImpl->SetLayout( GetImplementation( binLayout ) ) ;
}
void Control::Impl::SetLayoutingRequired( bool layoutingRequired )
}
void Control::Impl::SetLayoutingRequired( bool layoutingRequired )