X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fanimated-image%2Fanimated-image-visual.h;h=0d21f97f22eb42f063447dc22a8b1daee8338fef;hb=b31764bc76595c1ccd58cf4366dcde2cc78e72cf;hp=b5fbb2e7d4a1d739128bb884a59804cb3760d478;hpb=70cda53a32b66bcc77619835cc06049635043d91;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h old mode 100644 new mode 100755 index b5fbb2e..0d21f97 --- a/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h +++ b/dali-toolkit/internal/visuals/animated-image/animated-image-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_ANIMATED_IMAGE_VISUAL_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,22 +123,22 @@ public: // from Visual /** * @copydoc Visual::Base::GetNaturalSize */ - virtual void GetNaturalSize( Vector2& naturalSize ); + void GetNaturalSize( Vector2& naturalSize ) override; /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoCreateInstancePropertyMap( Property::Map& map ) const; + void DoCreateInstancePropertyMap( Property::Map& map ) const override; /** * @copydoc Visual::Base::OnDoAction */ - virtual void OnDoAction( const Dali::Property::Index actionName, const Dali::Property::Value& attributes ) override; + void OnDoAction( const Dali::Property::Index actionName, const Dali::Property::Value& attributes ) override; protected: @@ -158,7 +158,7 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** * Helper method to set individual values by index key. @@ -170,17 +170,17 @@ protected: /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; /** * @copydoc Visual::Base::DoSetOffStage */ - virtual void DoSetOffStage( Actor& actor ); + void DoSetOffStage( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); + void OnSetTransform() override; private: /** @@ -264,8 +264,10 @@ private: Dali::WrapMode::Type mWrapModeU:3; Dali::WrapMode::Type mWrapModeV:3; - DevelAnimatedImageVisual::Action::Type mActionStatus:2; + DevelAnimatedImageVisual::Action::Type mActionStatus:3; + DevelImageVisual::StopBehavior::Type mStopBehavior:2; bool mStartFirstFrame:1; + bool mIsJumpTo:1; }; } // namespace Internal