X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition%2Ftransition-impl.h;h=7230e2b322042e58ff4bf1512a68a67716a0fc6e;hb=ba2b1aa2e87716f4ef107e0fa627573475e93470;hp=6aa1374b8a25df84bbf7eca5fa3cc789390d659c;hpb=862dfd28532f834238394c7ec0a15069c9bd2188;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 6aa1374..7230e2b 100644 --- a/dali-toolkit/internal/transition/transition-impl.h +++ b/dali-toolkit/internal/transition/transition-impl.h @@ -41,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] 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: /** @@ -63,6 +64,7 @@ protected: */ Transition(Dali::Toolkit::Control source, Dali::Toolkit::Control destination, + bool useDestinationTarget, TimePeriod timePeriod); /** @@ -78,8 +80,15 @@ private: Transition& operator=(const Transition& rhs); private: - WeakHandle mSourceControl; - WeakHandle mDestinationControl; + Dali::Toolkit::Control GetTargetControl(); + Dali::Toolkit::Control GetWaitingControl(); + +private: + bool mUseDestinationTarget; + Vector3 mOriginalSize; + std::vector> mOriginalVisualProperties; + WeakHandle mSourceControl; + WeakHandle mDestinationControl; }; } // namespace Internal