X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition%2Ftransition-impl.h;h=7230e2b322042e58ff4bf1512a68a67716a0fc6e;hb=ba2b1aa2e87716f4ef107e0fa627573475e93470;hp=d9120bf53013473f21db9fbea4be9e5f5db53cb3;hpb=1472fda30a44315490d628a4b36459b423364802;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/transition/transition-impl.h b/dali-toolkit/internal/transition/transition-impl.h
index d9120bf..7230e2b 100644
--- a/dali-toolkit/internal/transition/transition-impl.h
+++ b/dali-toolkit/internal/transition/transition-impl.h
@@ -23,6 +23,9 @@
 #include <dali-toolkit/public-api/controls/control.h>
 #include <dali-toolkit/public-api/transition/transition.h>
 
+// EXTERNAL INCLUDES
+#include <dali/public-api/object/weak-handle.h>
+
 namespace Dali
 {
 namespace Toolkit
@@ -38,10 +41,11 @@ public:
    * @brief Create a new Transition object.
    * @param[in] source A source control of this transition.
    * @param[in] destination A destination control of this transition.
-   * @param[in] durationSeconds The duration of the animation.
+   * @param[in] useDestinationTarget True if this transition uses destination control as target.
+   * @param[in] timePeriod The timePeriod of the animation.
    * @return A smart-pointer to the newly allocated Transition.
    */
-  static TransitionPtr New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, TimePeriod timePeriod);
+  static TransitionPtr New(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, bool useDestinationTarget, TimePeriod timePeriod);
 
 protected:
   /**
@@ -60,6 +64,7 @@ protected:
    */
   Transition(Dali::Toolkit::Control source,
              Dali::Toolkit::Control destination,
+             bool                   useDestinationTarget,
              TimePeriod             timePeriod);
 
   /**
@@ -75,8 +80,15 @@ private:
   Transition& operator=(const Transition& rhs);
 
 private:
-  Dali::Toolkit::Control mSourceControl;
-  Dali::Toolkit::Control mDestinationControl;
+  Dali::Toolkit::Control GetTargetControl();
+  Dali::Toolkit::Control GetWaitingControl();
+
+private:
+  bool                                                               mUseDestinationTarget;
+  Vector3                                                            mOriginalSize;
+  std::vector<std::pair<Dali::Property::Index, Dali::Property::Map>> mOriginalVisualProperties;
+  WeakHandle<Dali::Toolkit::Control>                                 mSourceControl;
+  WeakHandle<Dali::Toolkit::Control>                                 mDestinationControl;
 };
 
 } // namespace Internal