projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add temporaty log to node"
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
nodes
/
node.h
diff --git
a/dali/internal/update/nodes/node.h
b/dali/internal/update/nodes/node.h
index
1f81d05
..
d1fa90b
100644
(file)
--- a/
dali/internal/update/nodes/node.h
+++ b/
dali/internal/update/nodes/node.h
@@
-122,13
+122,13
@@
public:
* @param[in] updated The updated flag
* (used for partial rendering to mark an animating sub tree for example).
*/
* @param[in] updated The updated flag
* (used for partial rendering to mark an animating sub tree for example).
*/
- void SetUpdated
(bool updated) override
+ void SetUpdated
Tree(bool updated)
{
mUpdated = updated;
for(Node* child : mChildren)
{
{
mUpdated = updated;
for(Node* child : mChildren)
{
- child->SetUpdated(updated);
+ child->SetUpdated
Tree
(updated);
}
}
}
}
@@
-622,9
+622,6
@@
public:
{
if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID)
{
{
if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID)
{
- DALI_LOG_RELEASE_INFO("id = %d, data = %p, manager = %p, id = %d, mSize data = %p\n",
- mId, &mTransformManagerData, mTransformManagerData.mManager, mTransformManagerData.mId, mSize.mTxManagerData);
-
return mSize.Get(0);
}
return mSize.Get(0);
}
@@
-733,7
+730,7
@@
public:
mTransparent = transparent;
}
mTransparent = transparent;
}
- bool
Get
Transparent() const
+ bool
Is
Transparent() const
{
return mTransparent;
}
{
return mTransparent;
}
@@
-967,7
+964,7
@@
protected:
bool mIsRoot : 1; ///< True if the node cannot have a parent
bool mIsLayer : 1; ///< True if the node is a layer
bool mPositionUsesAnchorPoint : 1; ///< True if the node should use the anchor-point when calculating the position
bool mIsRoot : 1; ///< True if the node cannot have a parent
bool mIsLayer : 1; ///< True if the node is a layer
bool mPositionUsesAnchorPoint : 1; ///< True if the node should use the anchor-point when calculating the position
- bool mTransparent : 1;
+ bool mTransparent : 1;
///< True if this node is transparent. This value do not affect children.
// Changes scope, should be at end of class
DALI_LOG_OBJECT_STRING_DECLARATION;
// Changes scope, should be at end of class
DALI_LOG_OBJECT_STRING_DECLARATION;