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 "[ATSPI] Check higlight area using PropertyNotification" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
transition
/
transition-base-impl.cpp
diff --git
a/dali-toolkit/internal/transition/transition-base-impl.cpp
b/dali-toolkit/internal/transition/transition-base-impl.cpp
index
42fb10d
..
ca34d77
100644
(file)
--- a/
dali-toolkit/internal/transition/transition-base-impl.cpp
+++ b/
dali-toolkit/internal/transition/transition-base-impl.cpp
@@
-104,7
+104,8
@@
TransitionBase::TransitionBase()
: mAlphaFunction(DEFAULT_ALPHA_FUNCTION),
mTimePeriod(TimePeriod(0.0f)),
mTransitionWithChild(false),
: mAlphaFunction(DEFAULT_ALPHA_FUNCTION),
mTimePeriod(TimePeriod(0.0f)),
mTransitionWithChild(false),
- mMoveTargetChildren(false)
+ mMoveTargetChildren(false),
+ mIsAppearingTransition(true)
{
}
{
}
@@
-218,10
+219,11
@@
void TransitionBase::CopyTarget()
{
mCopiedActor = Dali::Actor::New();
mTarget.GetParent().Add(mCopiedActor);
{
mCopiedActor = Dali::Actor::New();
mTarget.GetParent().Add(mCopiedActor);
+
mCopiedActor[Dali::DevelActor::Property::SIBLING_ORDER] = static_cast<int32_t>(mTarget[Dali::DevelActor::Property::SIBLING_ORDER]) + 1;
mCopiedActor[Dali::DevelActor::Property::SIBLING_ORDER] = static_cast<int32_t>(mTarget[Dali::DevelActor::Property::SIBLING_ORDER]) + 1;
-
for(uint32_t i = 0; i < mTarget.GetChildCount(); ++i
)
+
while(mTarget.GetChildCount() > 0
)
{
{
- Dali::Actor child = mTarget.GetChildAt(
i
);
+ Dali::Actor child = mTarget.GetChildAt(
0
);
Dali::DevelActor::SwitchParent(child, mCopiedActor);
}
Dali::DevelActor::SwitchParent(child, mCopiedActor);
}
@@
-237,9
+239,9
@@
void TransitionBase::TransitionFinished()
mTarget.SetProperties(mOriginalPropertyMap);
if(mMoveTargetChildren)
{
mTarget.SetProperties(mOriginalPropertyMap);
if(mMoveTargetChildren)
{
-
for(uint32_t i = 0; i < mCopiedActor.GetChildCount(); ++i
)
+
while(mCopiedActor.GetChildCount() > 0
)
{
{
- Dali::Actor child = mCopiedActor.GetChildAt(
i
);
+ Dali::Actor child = mCopiedActor.GetChildAt(
0
);
Dali::DevelActor::SwitchParent(child, mTarget);
}
mCopiedActor.Unparent();
Dali::DevelActor::SwitchParent(child, mTarget);
}
mCopiedActor.Unparent();