X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.h;h=5edf2ba3a399a252ece43e29490df7251aede44f;hb=3e3fec51905006fa2438965246593dab9c4e74e5;hp=ba9a59000709bdfbd114420e6af5e54c54c0081b;hpb=9ddd5fea6278d06b8874988498c7c4c6508750ba;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 ba9a590..5edf2ba 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.h +++ b/dali-toolkit/internal/visuals/color/color-visual.h @@ -104,26 +104,19 @@ protected: void OnSetTransform() override; /** - * @copydoc Visual::Base::OnDoAction - */ - void OnDoAction(const Property::Index actionId, const Property::Value& attributes) override; - - /** * @copydoc Visual::Base::UpdateShader */ void UpdateShader() override; /** - * @copydoc Visual::Base::OnGetPropertyObject + * @copydoc Visual::Base::GenerateShader */ - Dali::Property OnGetPropertyObject(Dali::Property::Key key) override; + Shader GenerateShader() const override; -private: /** - * @brief Get a shader for the current properties. - * @return The shader for the current properties. + * @copydoc Visual::Base::OnGetPropertyObject */ - Shader GetShader(); + Dali::Property OnGetPropertyObject(Dali::Property::Key key) override; private: // Undefined @@ -133,10 +126,9 @@ private: ColorVisual& operator=(const ColorVisual& colorRenderer); private: - float mBlurRadius; ///< The blur radius - Property::Index mBlurRadiusIndex; ///< The blur radius property index - bool mRenderIfTransparent; ///< Whether we should render even if the mix-color is transparent. - bool mNeedBlurRadius; ///< Whether we need the blur radius in shader. + float mBlurRadius; ///< The blur radius + Property::Index mBlurRadiusIndex; ///< The blur radius property index + bool mAlwaysUsingBlurRadius : 1; ///< Whether we need the blur radius in shader always. }; } // namespace Internal