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 ability to have strings over multiple lines in JSON using a Property Array
[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
71f85f9
..
1f81195
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,50
+32,53
@@
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
- */
- BatchImageVisual( VisualFactoryCache& factoryCache );
-
- /**
- * @brief A reference counted object may only be deleted by calling Unreference().
+ * @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] url The URL of the image to use
+ * @param[in] properties A Property::Map containing settings for this visual
+ * @return A smart-pointer to the newly allocated visual.
*/
*/
-
~BatchImageVisual(
);
+
static BatchImageVisualPtr New( VisualFactoryCache& factoryCache, const std::string& url, const Property::Map& properties = Property::Map()
);
public: // from Visual
/**
public: // from Visual
/**
- * @copydoc Visual::Base::
Set
Size
+ * @copydoc Visual::Base::
GetNatural
Size
*/
*/
- virtual void
SetSize( const Vector2& s
ize );
+ virtual void
GetNaturalSize( Vector2& naturalS
ize );
/**
/**
- * @copydoc Visual::Base::
GetNaturalSize
+ * @copydoc Visual::Base::
CreatePropertyMap
*/
*/
- virtual void GetNaturalSize( Vector2& naturalSize ) const;
+ virtual void DoCreatePropertyMap( Property::Map& map ) const;
+
+protected:
/**
/**
- * @copydoc Visual::Base::SetClipRect
+ * @brief Constructor.
+ *
+ * @param[in] factoryCache The VisualFactoryCache object
*/
*/
-
virtual void SetClipRect( const Rect<int>& clipRect
);
+
BatchImageVisual( VisualFactoryCache& factoryCache
);
/**
/**
- * @
copydoc Visual::Base::CreatePropertyMap
+ * @
brief A reference counted object may only be deleted by calling Unreference().
*/
*/
- virtual void DoCreatePropertyMap( Property::Map& map ) const;
-
-protected:
+ ~BatchImageVisual();
/**
/**
- * @copydoc Visua::Base::Do
Initialize
+ * @copydoc Visua::Base::Do
SetProperties
*/
*/
- virtual void Do
Initialize( Actor& actor,
const Property::Map& propertyMap );
+ virtual void Do
SetProperties(
const Property::Map& propertyMap );
/**
* @copydoc Visual::Base::DoSetOnStage
/**
* @copydoc Visual::Base::DoSetOnStage
@@
-87,6
+90,11
@@
protected:
*/
virtual void DoSetOffStage( Actor& actor );
*/
virtual void DoSetOffStage( Actor& actor );
+ /**
+ * @copydoc Visual::Base::OnSetTransform
+ */
+ virtual void OnSetTransform();
+
private:
/**
private:
/**
@@
-107,6
+115,13
@@
private:
*/
void CleanCache( const std::string& url );
*/
void CleanCache( const std::string& url );
+ /**
+ * Helper method to set individual values by index key.
+ * @param[in] index The index key of the value
+ * @param[in] value The value
+ */
+ void DoSetProperty( Property::Index index, const Property::Value& value );
+
private:
Vector4 mAtlasRect;
private:
Vector4 mAtlasRect;