projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed all property & signal names to lowerCamelCase
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
controls
/
renderer-factory
/
renderer-factory.h
diff --git
a/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h
b/dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h
index
13242f4
..
6d7a4b8
100644
(file)
--- a/
dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h
+++ b/
dali-toolkit/devel-api/controls/renderer-factory/renderer-factory.h
@@
-41,9
+41,9
@@
class RendererFactory;
*
* The renderer type is required in the property map for requesting a control renderer.
*
*
* The renderer type is required in the property map for requesting a control renderer.
*
- * | %Property Name
| Type |
- * |--------------------------
-
|------------------|
- * | renderer
-t
ype | STRING |
+ * | %Property Name | Type |
+ * |--------------------------|------------------|
+ * | renderer
T
ype | STRING |
*/
class DALI_IMPORT_API RendererFactory : public BaseHandle
{
*/
class DALI_IMPORT_API RendererFactory : public BaseHandle
{
@@
-109,10
+109,10
@@
public:
* else the renderer would be a handle to a newly created internal color renderer.
*
* @param[in] renderer The ControlRenderer to reset
* else the renderer would be a handle to a newly created internal color renderer.
*
* @param[in] renderer The ControlRenderer to reset
+ * @param[in] actor The Actor the renderer is applied to if, empty if the renderer has not been applied to any Actor
* @param[in] color The color to be rendered.
* @param[in] color The color to be rendered.
- * @return Whether a new internal control renderer is created.
*/
*/
-
bool ResetRenderer( ControlRenderer& rendere
r, const Vector4& color );
+
void ResetRenderer( ControlRenderer& renderer, Actor& acto
r, const Vector4& color );
/**
* @brief Request the control renderer to renderer the border with the given size and color.
/**
* @brief Request the control renderer to renderer the border with the given size and color.
@@
-138,10
+138,10
@@
public:
* else the renderer would be a handle to a newly created internal image renderer.
*
* @param[in] renderer The ControlRenderer to reset
* else the renderer would be a handle to a newly created internal image renderer.
*
* @param[in] renderer The ControlRenderer to reset
+ * @param[in] actor The Actor the renderer is applied to if, empty if the renderer has not been applied to any Actor
* @param[in] image The Image to be rendered.
* @param[in] image The Image to be rendered.
- * @return Whether a new internal control renderer is created.
*/
*/
-
bool ResetRenderer( ControlRenderer& rendere
r, const Image& image );
+
void ResetRenderer( ControlRenderer& renderer, Actor& acto
r, const Image& image );
/**
* @brief Request the control renderer to render the given resource at the url.
/**
* @brief Request the control renderer to render the given resource at the url.
@@
-158,10
+158,10
@@
public:
* else the renderer would be a handle to a newly created internal image renderer.
*
* @param[in] renderer The ControlRenderer to reset
* else the renderer would be a handle to a newly created internal image renderer.
*
* @param[in] renderer The ControlRenderer to reset
+ * @param[in] actor The Actor the renderer is applied to if, empty if the renderer has not been applied to any Actor
* @param[in] url The URL to the resource to be rendered.
* @param[in] url The URL to the resource to be rendered.
- * @return Whether a new internal control renderer is created.
*/
*/
-
bool ResetRenderer( ControlRenderer& rendere
r, const std::string& url );
+
void ResetRenderer( ControlRenderer& renderer, Actor& acto
r, const std::string& url );
/**
/**
@@
-170,11
+170,12
@@
public:
* if the current renderer is capable of merging with the property map the reset the renderer with the merged properties
* else the renderer would be a handle to a newly created internal renderer.
*
* if the current renderer is capable of merging with the property map the reset the renderer with the merged properties
* else the renderer would be a handle to a newly created internal renderer.
*
+ * @param[in] renderer The ControlRenderer to reset
+ * @param[in] actor The Actor the renderer is applied to if, empty if the renderer has not been applied to any Actor
* @param[in] propertyMap The map contains the properties required by the control renderer
* Depends on the content of the map, different kind of renderer would be returned.
* @param[in] propertyMap The map contains the properties required by the control renderer
* Depends on the content of the map, different kind of renderer would be returned.
- * @return Whether a new internal control renderer is created.
*/
*/
-
bool ResetRenderer( ControlRenderer& rendere
r, const Property::Map& propertyMap );
+
void ResetRenderer( ControlRenderer& renderer, Actor& acto
r, const Property::Map& propertyMap );
private:
private: