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
Add Tab key focus movement.
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
public-api
/
animation-definition.cpp
diff --git
a/dali-scene-loader/public-api/animation-definition.cpp
b/dali-scene-loader/public-api/animation-definition.cpp
index
ee2b519
..
850dd00
100644
(file)
--- a/
dali-scene-loader/public-api/animation-definition.cpp
+++ b/
dali-scene-loader/public-api/animation-definition.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
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.
@@
-20,9
+20,8
@@
namespace Dali
{
namespace SceneLoader
{
{
namespace SceneLoader
{
-
const float AnimationDefinition::DEFAULT_DURATION_SECONDS = 1.f;
const float AnimationDefinition::DEFAULT_DURATION_SECONDS = 1.f;
-const float AnimationDefinition::MIN_DURATION_SECONDS = 1e-2f;
+const float AnimationDefinition::MIN_DURATION_SECONDS
= 1e-2f;
Animation::EndAction AnimationDefinition::StopForModification(Animation& anim)
{
Animation::EndAction AnimationDefinition::StopForModification(Animation& anim)
{
@@
-43,12
+42,13
@@
AnimationDefinition::AnimationDefinition(AnimationDefinition&& other)
mSpeedFactor(other.mSpeedFactor),
mPlayRange(other.mPlayRange),
mProperties(std::move(other.mProperties))
mSpeedFactor(other.mSpeedFactor),
mPlayRange(other.mPlayRange),
mProperties(std::move(other.mProperties))
-{}
+{
+}
void AnimationDefinition::Animate(Animation& animation, AnimatedProperty::GetActor getActor)
{
DALI_ASSERT_ALWAYS(animation);
void AnimationDefinition::Animate(Animation& animation, AnimatedProperty::GetActor getActor)
{
DALI_ASSERT_ALWAYS(animation);
- for
(auto& ap : mProperties)
+ for(auto& ap : mProperties)
{
ap.Animate(animation, getActor);
}
{
ap.Animate(animation, getActor);
}
@@
-72,16
+72,16
@@
Animation AnimationDefinition::ReAnimate(AnimatedProperty::GetActor getActor)
AnimationDefinition& AnimationDefinition::operator=(AnimationDefinition&& other)
{
AnimationDefinition tmp(std::move(other));
AnimationDefinition& AnimationDefinition::operator=(AnimationDefinition&& other)
{
AnimationDefinition tmp(std::move(other));
- mName = std::move(tmp.mName);
- mDuration = tmp.mDuration;
- mLoopCount = tmp.mLoopCount;
+ mName
= std::move(tmp.mName);
+ mDuration
= tmp.mDuration;
+ mLoopCount
= tmp.mLoopCount;
mDisconnectAction = tmp.mDisconnectAction;
mDisconnectAction = tmp.mDisconnectAction;
- mEndAction = tmp.mEndAction;
- mSpeedFactor = tmp.mSpeedFactor;
- mPlayRange = tmp.mPlayRange;
+ mEndAction
= tmp.mEndAction;
+ mSpeedFactor
= tmp.mSpeedFactor;
+ mPlayRange
= tmp.mPlayRange;
mProperties.swap(tmp.mProperties);
return *this;
}
mProperties.swap(tmp.mProperties);
return *this;
}
-}
-}
+}
// namespace SceneLoader
+}
// namespace Dali