X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-impl.h;h=bdcb1939798e87a11951dd40c01bfd0d32121661;hp=d04d3df78c481a2bca971095d725920c8bd7ca93;hb=5a936aac073676657d48db5c42e5d2ad3f5cac9f;hpb=8d0ccc12714da58e6e2c971188b221ed2158d658 diff --git a/dali-toolkit/internal/visuals/visual-base-impl.h b/dali-toolkit/internal/visuals/visual-base-impl.h index d04d3df..bdcb193 100644 --- a/dali-toolkit/internal/visuals/visual-base-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_VISUAL_H /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -92,12 +92,12 @@ public: void SetTransformAndSize(const Property::Map& transform, Size controlSize); /** - * @brief Performs an action on the visual with the given action name and attributes. + * @brief Performs an action on the visual with the given action id and attributes. * - * @param[in] actionName The name of the action to perform this API only takes an Index + * @param[in] actionId The id of the action to perform this API only takes an Index * @param[in] attributes The list of attributes for the action. ( optional for this data structure to have content ) */ - void DoAction(const Dali::Property::Index actionName, const Dali::Property::Value attributes); + void DoAction(const Dali::Property::Index actionId, const Dali::Property::Value attributes); /** * @copydoc Toolkit::Visual::Base::GetHeightForWidth @@ -155,7 +155,7 @@ public: * * @param[in] preMultiplied whether alpha is pre-multiplied. */ - void EnablePreMultipliedAlpha(bool preMultiplied); + virtual void EnablePreMultipliedAlpha(bool preMultiplied); /** * @brief Query whether alpha is pre-multiplied. @@ -186,6 +186,13 @@ public: Renderer GetRenderer(); /** + * Convert all string keys to int keys + * @param[in] key The key to convert + * @return the index key supplied or matching, or INVALID_INDEX if no match + */ + static Property::Index GetIntKey(Property::Key key); + + /** * Sets the mix color ( including opacity ) of the visual. * @param[in] mixColor The new mix color */ @@ -232,8 +239,8 @@ public: void ResourceReady(Toolkit::Visual::ResourceStatus resourceStatus); /** - * @brief Called when the visuals resources are loaded / ready - * @return true if ready, false otherwise + * @brief Called when the visuals resources are loaded / ready or failed (mean, broken image ready) + * @return true if ready or failed (mean, broken image ready), false otherwise */ virtual bool IsResourceReady() const; @@ -415,6 +422,11 @@ private: void RegisterMixColor(); /** + * Register the uniform on the DecoratedVisualRenderer and store the property index if necessary. + */ + void RegisterDecoration(); + + /** * Find the matching property on the renderer or shader. If it's a shader * property, register it on the renderer in order to animate it for this * visual independently.