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
Delete YGNode only root of Flex::Node
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
layouting
/
flex-node.cpp
diff --git
a/dali-toolkit/devel-api/layouting/flex-node.cpp
b/dali-toolkit/devel-api/layouting/flex-node.cpp
index
c3636dc
..
8a7dae6
100644
(file)
--- a/
dali-toolkit/devel-api/layouting/flex-node.cpp
+++ b/
dali-toolkit/devel-api/layouting/flex-node.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-93,9
+93,12
@@
Node::Node()
Node::~Node()
{
DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() >> \n");
Node::~Node()
{
DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() >> \n");
+ // Destruct child Flex::Node first
+ mImpl->mChildNodes.clear();
+
if(mImpl->mYogaNode)
{
if(mImpl->mYogaNode)
{
- YGNodeFree
Recursive
(mImpl->mYogaNode);
+ YGNodeFree(mImpl->mYogaNode);
mImpl->mYogaNode = nullptr;
}
DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() <<\n");
mImpl->mYogaNode = nullptr;
}
DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Destructor() <<\n");