ANIMATOR : Bug fix for predefined animation insertion

Modify compare condition for addChild method in AnimatorKeyframe, Copy left side properties to all keyframes when predefined animation inserted

Change-Id: I3cccf66e92f022ce8daa21c62af7d1af727835ba
Signed-off-by: seongwon.shim <seongwon.shim@samsung.com>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorKeyframe.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorKeyframe.java
index 2d19b28..5e919da 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorKeyframe.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorKeyframe.java
@@ -354,7 +354,7 @@ public class AnimatorKeyframe extends AnimatorModel {
 
         for (AnimatorModel model : getChildren()) {
             AnimatorFrame frame = (AnimatorFrame) model;
-            if (Double.compare(frame.getFrameTime(), addFrame.getFrameTime()) < 0)
+            if (Double.compare(frame.getFrameTime(), addFrame.getFrameTime()) <= 0)
                 index++;
             else
                 break;

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorSelector.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorSelector.java
index 27efff8..3f77668 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorSelector.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorSelector.java
@@ -519,7 +519,7 @@ public class AnimatorSelector extends AnimatorModel {
 
         if (previousKeyframe != null) {
             AnimatorFrame previousFrame = previousKeyframe.getLastFrame();
-//            copyLeftPropertiesToAllFramesInKeyframe(previousFrame, keyframe);
+            copyLeftPropertiesToAllFramesInKeyframe(previousFrame, keyframe);
 
             if (previousFrame != null) {
                 if (!previousFrame.hasSamePropertyValue(keyframe.getFirstFrame())) {
@@ -548,7 +548,7 @@ public class AnimatorSelector extends AnimatorModel {
      * @param previousFrame
      * @param keyframe
      */
-/*    private void copyLeftPropertiesToAllFramesInKeyframe(AnimatorFrame previousFrame,
+    private void copyLeftPropertiesToAllFramesInKeyframe(AnimatorFrame previousFrame,
                                                          AnimatorKeyframe keyframe) {
         List<AnimatorModel> frames = keyframe.getChildren();
         for (AnimatorModel frameModel : frames) {
@@ -568,11 +568,11 @@ public class AnimatorSelector extends AnimatorModel {
                                         .getValue())));
                     }
                 } else {
-                    frame.getProperties().put(key, previousProperties.get(key));
+//                    frame.addProperty(key, previousProperties.get(key));
                 }
             }
         }
-    }*/
+    }
 
     /**
      * Get css string