ANIMATOR : Refresh TimeText

TimeText is refreshing when move playheader.

Change-Id: Ie1397dac866b8a13602eb3ddf413f755db69c44d
Signed-off-by: jinwooim.bae <jinwooim.bae@samsung.com>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/editpart/TimelineEditPart.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/editpart/TimelineEditPart.java
index c0e9a7a..fd1c14f 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/editpart/TimelineEditPart.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/editpart/TimelineEditPart.java
@@ -1144,6 +1144,7 @@ public class TimelineEditPart extends AbstractTreeEditPart {
                 int size = childEditPart.size();
                 for (int i = 0; i < size; ++i) {
                     ((TimelineEditPart) childEditPart.get(i)).refreshSelectorId();
+                    ((TimelineEditPart) childEditPart.get(i)).getOutlineElement().redraw();
                 }
 
                 getOutlineElement().redraw();

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/PlayHeader.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/PlayHeader.java
index 4569dbb..73c61d3 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/PlayHeader.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/ui/views/timeline/header/PlayHeader.java
@@ -140,6 +140,8 @@ public class PlayHeader extends Composite {
                     } else {
                         setLocation((rMarker.x - mouseDownPoint + e.x),
                                     TimelineConstants.DEFAULT_TIMELINE_MARKER_Y);
+                        int pointTime = getPlayHeaderTime();
+                        setCurrentPointTime(pointTime);
                     }
 
                     // update marker point time

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java
index fd338ef..e54e4c8 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/editparts/HoverViewerEditPart.java
@@ -210,10 +210,6 @@ public class HoverViewerEditPart extends AbstractGraphicalEditPart implements IP
         if(e.getPart() instanceof AnimatorWidgetPart) {
                ((AnimatorWidgetPart) e.getPart()).widgetPropertyEdit();
         }
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
     }
 
     @Override