X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fgradient%2Fgradient-visual.h;h=c67ee871e8bd49af4dc700ba37ab76ea181337ec;hb=03b2412efd35045dffc7f45f83e321e932d608ef;hp=5171b12548faf25a339faacddb89f1e17bfcda28;hpb=f4c1e7f52d49c3ce033b9ee4c3c7414b06a22d45;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.h b/dali-toolkit/internal/visuals/gradient/gradient-visual.h index 5171b12..c67ee87 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.h +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_GRADIENT_VISUAL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -88,31 +88,22 @@ public: * @brief Create a new gradient visual. * * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object + * @param[in] properties A Property::Map containing settings for this visual * @return A smart-pointer to the newly allocated visual. */ - static GradientVisualPtr New( VisualFactoryCache& factoryCache ); + static GradientVisualPtr New( VisualFactoryCache& factoryCache, const Property::Map& properties ); public: // from Visual /** - * @copydoc Visual::Base::SetSize - */ - virtual void SetSize( const Vector2& size ); - - /** * @copydoc Visual::Base::CreatePropertyMap */ - virtual void DoCreatePropertyMap( Property::Map& map ) const; + void DoCreatePropertyMap( Property::Map& map ) const override; /** - * @copydoc Visual::Base::DoSetProperty + * @copydoc Visual::Base::CreateInstancePropertyMap */ - virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ); - - /** - * @copydoc Visual::Base::DoGetProperty - */ - virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index ); + void DoCreateInstancePropertyMap( Property::Map& map ) const override; protected: @@ -129,14 +120,19 @@ protected: virtual ~GradientVisual(); /** - * @copydoc Visual::Base::DoInitialize + * @copydoc Visual::Base::DoSetProperties + */ + void DoSetProperties( const Property::Map& propertyMap ) override; + + /** + * @copydoc Visual::Base::OnSetTransform */ - virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap ); + void OnSetTransform() override; /** * @copydoc Visual::Base::DoSetOnStage */ - virtual void DoSetOnStage( Actor& actor ); + void DoSetOnStage( Actor& actor ) override; private: @@ -172,6 +168,7 @@ private: Matrix3 mGradientTransform; IntrusivePtr mGradient; Type mGradientType; + bool mIsOpaque; ///< Set to false if any of the stop colors are not opaque }; } // namespace Internal