[dali_2.3.25] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / visuals / transition-data-impl.cpp

diff --git a/dali-toolkit/internal/visuals/transition-data-impl.cpp b/dali-toolkit/internal/visuals/transition-data-impl.cpp
index 43fe953..81a5ec7 100644 (file)
--- a/dali-toolkit/internal/visuals/transition-data-impl.cpp
+++ b/dali-toolkit/internal/visuals/transition-data-impl.cpp
@@ -39,6 +39,7 @@ const char* TOKEN_TIME_PERIOD("timePeriod");
 const char* TOKEN_DURATION("duration");
 const char* TOKEN_DELAY("delay");
 const char* TOKEN_ALPHA_FUNCTION("alphaFunction");
+const char* TOKEN_ANIMATION_TYPE("animationType");
 
 DALI_ENUM_TO_STRING_TABLE_BEGIN(ALPHA_FUNCTION_BUILTIN)
   DALI_ENUM_TO_STRING_WITH_SCOPE(AlphaFunction, LINEAR)
@@ -315,6 +316,24 @@ TransitionData::Animator* TransitionData::ConvertMap(const Property::Map& map)
             }
           }
         }
+        else if(key == TOKEN_ANIMATION_TYPE)
+        {
+          if((value.GetType() == Property::STRING))
+          {
+            if(value.Get<std::string>() == "TO")
+            {
+              animator->animationType = AnimationType::TO;
+            }
+            else if(value.Get<std::string>() == "BETWEEN")
+            {
+              animator->animationType = AnimationType::BETWEEN;
+            }
+            else if(value.Get<std::string>() == "BY")
+            {
+              animator->animationType = AnimationType::BY;
+            }
+          }
+        }
       }
     }
   }