X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fimage%2Fimage-visual.h;h=55fb59b265a2096bdb5a56c9badb2f4f7d7ba6d3;hp=598660f0323ba9db20a775384f2e772551762727;hb=65ad9904d1df16ac5406fc316265c8f0388f0088;hpb=b8da2e53925b9abb9fa362560069e8ca4aa62f81 diff --git a/dali-toolkit/internal/visuals/image/image-visual.h b/dali-toolkit/internal/visuals/image/image-visual.h index 598660f..55fb59b 100644 --- a/dali-toolkit/internal/visuals/image/image-visual.h +++ b/dali-toolkit/internal/visuals/image/image-visual.h @@ -171,7 +171,7 @@ public: // from Visual /** * @copydoc Visual::Base::OnDoAction */ - void OnDoAction(const Dali::Property::Index actionName, const Dali::Property::Value& attributes) override; + void OnDoAction(const Dali::Property::Index actionId, const Dali::Property::Value& attributes) override; protected: /** @@ -233,6 +233,11 @@ protected: */ void UpdateShader() override; + /** + * @copydoc Visual::Base::GenerateShader + */ + Shader GenerateShader() const override; + public: /** * @copydoc AtlasUploadObserver::UploadCompleted @@ -315,12 +320,6 @@ private: */ void DoSetProperty(Property::Index index, const Property::Value& value); - /** - * @brief Get a shader for the current properties. - * @return The shader for the current properties. - */ - Shader GetShader(); - private: Vector4 mPixelArea; WeakHandle mPlacementActor;