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
[dali_1.2.15] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image
/
batch-image-visual.h
diff --git
a/dali-toolkit/internal/visuals/image/batch-image-visual.h
b/dali-toolkit/internal/visuals/image/batch-image-visual.h
index
646dad7
..
60209d3
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/batch-image-visual.h
+++ b/
dali-toolkit/internal/visuals/image/batch-image-visual.h
@@
-18,13
+18,13
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
+#include <dali/public-api/common/intrusive-ptr.h>
+
// INTERNAL HEADER
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
// INTERNAL HEADER
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
#include <dali-toolkit/internal/visuals/image-atlas-manager.h>
-// EXTERNAL INCLUDES
-#include <dali/public-api/images/resource-image.h>
-
namespace Dali
{
namespace Toolkit
namespace Dali
{
namespace Toolkit
@@
-32,45
+32,61
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
+class BatchImageVisual;
+typedef IntrusivePtr< BatchImageVisual > BatchImageVisualPtr;
+
class BatchImageVisual: public Visual::Base, public ConnectionTracker
{
public:
/**
class BatchImageVisual: public Visual::Base, public ConnectionTracker
{
public:
/**
- * @brief C
onstructor
.
+ * @brief C
reate a new batch-image visual
.
*
*
- * @param[in] factoryCache The VisualFactoryCache object
+ * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @return A smart-pointer to the newly allocated visual.
*/
*/
- BatchImageVisual( VisualFactoryCache& factoryCache );
+ static BatchImageVisualPtr New( VisualFactoryCache& factoryCache, const std::string& url );
+
+public: // from Visual
/**
/**
- * @
brief A reference counted object may only be deleted by calling Unreference().
+ * @
copydoc Visual::Base::GetNaturalSize
*/
*/
- ~BatchImageVisual();
-
-public: // from Visual
+ virtual void GetNaturalSize( Vector2& naturalSize );
/**
/**
- * @copydoc Visual::Base::
SetSize
+ * @copydoc Visual::Base::
CreatePropertyMap
*/
*/
- virtual void
SetSize( const Vector2& size )
;
+ virtual void
DoCreatePropertyMap( Property::Map& map ) const
;
/**
/**
- * @copydoc Visual::Base::
GetNaturalSize
+ * @copydoc Visual::Base::
DoSetProperty
*/
*/
- virtual void
GetNaturalSize( Vector2& naturalSize ) const
;
+ virtual void
DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue )
;
/**
/**
- * @copydoc Visual::Base::
CreatePropertyMap
+ * @copydoc Visual::Base::
DoGetProperty
*/
*/
- virtual
void DoCreatePropertyMap( Property::Map& map ) const
;
+ virtual
Dali::Property::Value DoGetProperty( Dali::Property::Index index )
;
protected:
/**
protected:
/**
- * @copydoc Visua::Base::DoInitialize
+ * @brief Constructor.
+ *
+ * @param[in] factoryCache The VisualFactoryCache object
+ */
+ BatchImageVisual( VisualFactoryCache& factoryCache );
+
+ /**
+ * @brief A reference counted object may only be deleted by calling Unreference().
*/
*/
- virtual void DoInitialize( Actor& actor, const Property::Map& propertyMap );
+ ~BatchImageVisual();
+
+ /**
+ * @copydoc Visua::Base::DoSetProperties
+ */
+ virtual void DoSetProperties( const Property::Map& propertyMap );
/**
* @copydoc Visual::Base::DoSetOnStage
/**
* @copydoc Visual::Base::DoSetOnStage
@@
-82,6
+98,11
@@
protected:
*/
virtual void DoSetOffStage( Actor& actor );
*/
virtual void DoSetOffStage( Actor& actor );
+ /**
+ * @copydoc Visual::Base::OnSetTransform
+ */
+ virtual void OnSetTransform();
+
private:
/**
private:
/**