X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftransition%2Ffade-transition-impl.h;fp=dali-toolkit%2Finternal%2Ftransition%2Ffade-impl.h;h=c2040b05cb89fa5695591cd348af08e60a40c69f;hp=0ac5c73ceeb5488e01e501b63fa6debfbe565049;hb=b4c3c44dfea70c23f81cb878392e1e84e23c9603;hpb=6f585409b0bfdb37162aaf8234255751e80c6e0e diff --git a/dali-toolkit/internal/transition/fade-impl.h b/dali-toolkit/internal/transition/fade-transition-impl.h similarity index 53% rename from dali-toolkit/internal/transition/fade-impl.h rename to dali-toolkit/internal/transition/fade-transition-impl.h index 0ac5c73..c2040b0 100644 --- a/dali-toolkit/internal/transition/fade-impl.h +++ b/dali-toolkit/internal/transition/fade-transition-impl.h @@ -1,5 +1,5 @@ -#ifndef DALI_TOOLKIT_INTERNAL_FADE_H -#define DALI_TOOLKIT_INTERNAL_FADE_H +#ifndef DALI_TOOLKIT_INTERNAL_FADE_TRANSITION_H +#define DALI_TOOLKIT_INTERNAL_FADE_TRANSITION_H /* * Copyright (c) 2021 Samsung Electronics Co., Ltd. @@ -21,7 +21,7 @@ // INTERNAL INCLUDES #include #include -#include +#include // EXTERNAL INCLUDES #include @@ -32,75 +32,75 @@ namespace Toolkit { namespace Internal { -using FadePtr = IntrusivePtr; +using FadeTransitionPtr = IntrusivePtr; -class Fade : public TransitionBase +class FadeTransition : public TransitionBase { public: /** - * @brief Create a new Fade object. + * @brief Create a new FadeTransition object. * @param[in] control A control of this transition. * @param[in] opacity opacity value the control Opacity property will be changed from/to. * @param[in] timePeriod The duration of the animation. - * @return A smart-pointer to the newly allocated Fade. + * @return A smart-pointer to the newly allocated FadeTransition. */ - static FadePtr New(Dali::Toolkit::Control control, float opacity, TimePeriod timePeriod); + static FadeTransitionPtr New(Dali::Toolkit::Control control, float opacity, TimePeriod timePeriod); protected: /** - * @copydoc Dali::Toolkit::Fade::OnPlay() + * @copydoc Dali::Toolkit::FadeTransition::OnPlay() */ void OnPlay() override; protected: /** - * @brief Construct a new Fade. + * @brief Construct a new FadeTransition. */ - Fade(Dali::Toolkit::Control control, - float opacity, - TimePeriod timePeriod); + FadeTransition(Dali::Toolkit::Control control, + float opacity, + TimePeriod timePeriod); /** * @brief A reference counted object may only be deleted by calling Unreference() */ - ~Fade() override; + ~FadeTransition() override; private: // Undefined - Fade(const Fade&); + FadeTransition(const FadeTransition&); // Undefined - Fade& operator=(const Fade& rhs); + FadeTransition& operator=(const FadeTransition& rhs); private: WeakHandle mTargetControl; - float mOpacity; + float mOpacity; }; } // namespace Internal // Helpers for public-api forwarding methods -inline Internal::Fade& GetImplementation(Dali::Toolkit::Fade& fade) +inline Internal::FadeTransition& GetImplementation(Dali::Toolkit::FadeTransition& fade) { - DALI_ASSERT_ALWAYS(fade && "Fade handle is empty"); + DALI_ASSERT_ALWAYS(fade && "FadeTransition handle is empty"); BaseObject& handle = fade.GetBaseObject(); - return static_cast(handle); + return static_cast(handle); } -inline const Internal::Fade& GetImplementation(const Dali::Toolkit::Fade& fade) +inline const Internal::FadeTransition& GetImplementation(const Dali::Toolkit::FadeTransition& fade) { - DALI_ASSERT_ALWAYS(fade && "Fade handle is empty"); + DALI_ASSERT_ALWAYS(fade && "FadeTransition handle is empty"); const BaseObject& handle = fade.GetBaseObject(); - return static_cast(handle); + return static_cast(handle); } } // namespace Toolkit } // namespace Dali -#endif // DALI_TOOLKIT_INTERNAL_FADE_H +#endif // DALI_TOOLKIT_INTERNAL_FADE_TRANSITION_H