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
Merge "Parent of TextLabel does not resize when text changes" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
layouting
/
layout-group-impl.cpp
diff --git
a/dali-toolkit/devel-api/layouting/layout-group-impl.cpp
b/dali-toolkit/devel-api/layouting/layout-group-impl.cpp
index
304cec5
..
8ddc819
100644
(file)
--- a/
dali-toolkit/devel-api/layouting/layout-group-impl.cpp
+++ b/
dali-toolkit/devel-api/layouting/layout-group-impl.cpp
@@
-552,7
+552,7
@@
void LayoutGroup::OnInitialize()
}
}
}
}
- RequestLayout( Dali::Toolkit::LayoutTransitionData::
LayoutTransition
Type::ON_OWNER_SET );
+ RequestLayout( Dali::Toolkit::LayoutTransitionData::Type::ON_OWNER_SET );
}
}
}
}
@@
-585,7
+585,7
@@
void LayoutGroup::RemoveChild( LayoutItem& item )
void LayoutGroup::ChildAddedToOwner( Actor child )
{
ChildAddedToOwnerImpl( child );
void LayoutGroup::ChildAddedToOwner( Actor child )
{
ChildAddedToOwnerImpl( child );
- RequestLayout( Dali::Toolkit::LayoutTransitionData::
LayoutTransitionType::ON_CHILD_ADD
);
+ RequestLayout( Dali::Toolkit::LayoutTransitionData::
Type::ON_CHILD_ADD, child, Actor()
);
}
void LayoutGroup::ChildAddedToOwnerImpl( Actor child )
}
void LayoutGroup::ChildAddedToOwnerImpl( Actor child )
@@
-670,7
+670,7
@@
void LayoutGroup::ChildRemovedFromOwner( Actor child )
if( childLayout )
{
Remove( *childLayout.Get() );
if( childLayout )
{
Remove( *childLayout.Get() );
- RequestLayout( Dali::Toolkit::LayoutTransitionData::
LayoutTransitionType::ON_CHILD_REMOVE
);
+ RequestLayout( Dali::Toolkit::LayoutTransitionData::
Type::ON_CHILD_REMOVE, child, Actor()
);
}
}
}
}
}
}