X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fcolor%2Fcolor-visual.h;h=6ced771106c0032e03818a05fb5d3c34b0b17b8f;hp=ba9a59000709bdfbd114420e6af5e54c54c0081b;hb=abf5d9bb2bc8c3db867355573bdf8c27389dcf23;hpb=9ddd5fea6278d06b8874988498c7c4c6508750ba;ds=sidebyside diff --git a/dali-toolkit/internal/visuals/color/color-visual.h b/dali-toolkit/internal/visuals/color/color-visual.h index ba9a590..6ced771 100644 --- a/dali-toolkit/internal/visuals/color/color-visual.h +++ b/dali-toolkit/internal/visuals/color/color-visual.h @@ -114,16 +114,14 @@ protected: 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 +131,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