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
Added a RendererCache and utilise it for ImageRenderer.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
renderers
/
image
/
image-renderer.h
diff --git
a/dali-toolkit/internal/controls/renderers/image/image-renderer.h
b/dali-toolkit/internal/controls/renderers/image/image-renderer.h
index
be9c2af
..
f408fb2
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/image/image-renderer.h
+++ b/
dali-toolkit/internal/controls/renderers/image/image-renderer.h
@@
-74,8
+74,10
@@
public:
/**
* @brief Constructor.
/**
* @brief Constructor.
+ *
+ * @param[in] factoryCache A pointer pointing to the RendererFactoryCache object
*/
*/
- ImageRenderer();
+ ImageRenderer(
RendererFactoryCache& factoryCache
);
/**
* @brief A reference counted object may only be deleted by calling Unreference().
/**
* @brief A reference counted object may only be deleted by calling Unreference().
@@
-85,14
+87,14
@@
public:
public: // from ControlRenderer
/**
public: // from ControlRenderer
/**
- * @copydoc ControlRenderer::
Initial
ize
+ * @copydoc ControlRenderer::
SetS
ize
*/
*/
- virtual void
Initialize( RendererFactoryCache& factoryCache, const Property::Map& propertyMap
);
+ virtual void
SetSize( const Vector2& size
);
/**
/**
- * @copydoc ControlRenderer::
Set
Size
+ * @copydoc ControlRenderer::
GetNatural
Size
*/
*/
- virtual void
SetSize( const Vector2& size )
;
+ virtual void
GetNaturalSize( Vector2& naturalSize ) const
;
/**
* @copydoc ControlRenderer::SetClipRect
/**
* @copydoc ControlRenderer::SetClipRect
@@
-104,8
+106,18
@@
public: // from ControlRenderer
*/
virtual void SetOffset( const Vector2& offset );
*/
virtual void SetOffset( const Vector2& offset );
+ /**
+ * @copydoc ControlRenderer::CreatePropertyMap
+ */
+ virtual void DoCreatePropertyMap( Property::Map& map ) const;
+
protected:
/**
protected:
/**
+ * @copydoc ControlRenderer::DoInitialize
+ */
+ virtual void DoInitialize( const Property::Map& propertyMap );
+
+ /**
* @copydoc ControlRenderer::DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
* @copydoc ControlRenderer::DoSetOnStage
*/
virtual void DoSetOnStage( Actor& actor );
@@
-115,14
+127,12
@@
protected:
*/
virtual void DoSetOffStage( Actor& actor );
*/
virtual void DoSetOffStage( Actor& actor );
-public:
-
/**
/**
- * Request the geometry and shader from the cache, if not available, create and save to the cache for sharing.
- *
- * @param[in] factoryCache A pointer pointing to the RendererFactoryCache object
+ * @copydoc ControlRenderer::InitializeRenderer
*/
*/
- void Initialize( RendererFactoryCache& factoryCache );
+ virtual void InitializeRenderer( Renderer& renderer );
+
+public:
/**
* @brief Sets the image of this renderer to the resource at imageUrl
/**
* @brief Sets the image of this renderer to the resource at imageUrl