X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.h;h=d5b2a6f1affb28e6c9a7dd4371c727485abbc8b4;hb=dea624eb348a4926d8761c8a1364f03f9f71acf5;hp=99758d1b6ba7e6833f7d13bed5c1c09821b5df24;hpb=4ed6dc168df9f847235529aa22d90e316f99a71f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h index 99758d1..d5b2a6f 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.h +++ b/dali-toolkit/internal/visuals/color/color-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_COLOR_VISUAL_H /* - * Copyright (c) 2016 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. @@ -63,7 +63,12 @@ public: // from Visual /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; + + /** + * @copydoc Visual::Base::CreateInstancePropertyMap + */ + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -82,25 +87,22 @@ protected: /** * @copydoc Visual::Base::DoSetProperties */ - virtual void DoSetProperties( const Property::Map& propertyMap ); + void DoSetProperties( const Property::Map& propertyMap ) override; /** - * @copydoc Visual::Base::DoSetOnStage + * @copydoc Visual::Base::DoSetOnScene */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnScene( Actor& actor ) override; /** * @copydoc Visual::Base::OnSetTransform */ - virtual void OnSetTransform(); - -public: + void OnSetTransform() override; /** - * Set the color for rendering. - * @param[in] color The color to be rendered. + * @copydoc Visual::Base::OnDoAction */ - void SetColor( const Vector4& color ); + void OnDoAction( const Property::Index actionId, const Property::Value& attributes ) override; private: /** @@ -118,9 +120,8 @@ private: private: - Vector4 mMixColor; - Property::Index mMixColorIndex; - + float mBlurRadius; ///< The blur radius + bool mRenderIfTransparent; ///< Whether we should render even if the mix-color is transparent. }; } // namespace Internal