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.65] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
svg
/
svg-visual.h
diff --git
a/dali-toolkit/internal/visuals/svg/svg-visual.h
b/dali-toolkit/internal/visuals/svg/svg-visual.h
index
0456bb5
..
7852bfc
100644
(file)
--- a/
dali-toolkit/internal/visuals/svg/svg-visual.h
+++ b/
dali-toolkit/internal/visuals/svg/svg-visual.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H
/*
#define DALI_TOOLKIT_INTERNAL_SVG_VISUAL_H
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-20,10
+20,11
@@
// EXTERNAL INCLUDES
#include <dali/public-api/common/intrusive-ptr.h>
// EXTERNAL INCLUDES
#include <dali/public-api/common/intrusive-ptr.h>
-#include <dali/
devel
-api/object/weak-handle.h>
+#include <dali/
public
-api/object/weak-handle.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/internal/visuals/visual-url.h>
struct NSVGimage;
struct NSVGimage;
@@
-54,12
+55,17
@@
class SvgVisual: public Visual::Base
public:
/**
public:
/**
- * @brief Create a new SVG visual.
+ * @brief Create the SVG Visual using the image URL.
+ *
+ * The visual will parse the SVG image once it is set.
+ * And rasterize it into BufferImage synchronously when the associated actor is put on stage, and destroy the BufferImage when it is off stage
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @param[in] imageUrl The URL to svg resource to use
+ * @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @return A smart-pointer to the newly allocated visual.
*/
- static SvgVisualPtr New( VisualFactoryCache& factoryCache );
+ static SvgVisualPtr New( VisualFactoryCache& factoryCache
, const VisualUrl& imageUrl, const Property::Map& properties
);
/**
* @brief Create the SVG Visual using the image URL.
/**
* @brief Create the SVG Visual using the image URL.
@@
-69,21
+75,16
@@
public:
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @param[in] imageUrl The URL to svg resource to use
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @param[in] imageUrl The URL to svg resource to use
- * @
param[in] size The required size for the SVG
+ * @
return A smart-pointer to the newly allocated visual.
*/
*/
- static SvgVisualPtr New( VisualFactoryCache& factoryCache, const
std::string& imageUrl, ImageDimensions size = ImageDimensions()
);
+ static SvgVisualPtr New( VisualFactoryCache& factoryCache, const
VisualUrl& imageUrl
);
public: // from Visual
/**
* @copydoc Visual::Base::GetNaturalSize
*/
public: // from Visual
/**
* @copydoc Visual::Base::GetNaturalSize
*/
- virtual void GetNaturalSize( Vector2& naturalSize ) const;
-
- /**
- * @copydoc Visual::Base::SetSize
- */
- virtual void SetSize( const Vector2& size );
+ virtual void GetNaturalSize( Vector2& naturalSize );
/**
* @copydoc Visual::Base::CreatePropertyMap
/**
* @copydoc Visual::Base::CreatePropertyMap
@@
-91,14
+92,9
@@
public: // from Visual
virtual void DoCreatePropertyMap( Property::Map& map ) const;
/**
virtual void DoCreatePropertyMap( Property::Map& map ) const;
/**
- * @copydoc Visual::Base::
DoSetProperty
+ * @copydoc Visual::Base::
CreateInstancePropertyMap
*/
*/
- virtual void DoSetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue );
-
- /**
- * @copydoc Visual::Base::DoGetProperty
- */
- virtual Dali::Property::Value DoGetProperty( Dali::Property::Index index );
+ virtual void DoCreateInstancePropertyMap( Property::Map& map ) const;
protected:
protected:
@@
-129,6
+125,11
@@
protected:
*/
virtual void DoSetOffStage( Actor& actor );
*/
virtual void DoSetOffStage( Actor& actor );
+ /**
+ * @copydoc Visual::Base::OnSetTransform
+ */
+ virtual void OnSetTransform();
+
public:
/**
public:
/**
@@
-144,9
+145,8
@@
private:
* @brief Parses the SVG Image from the set URL.
*
* @param[in] imageUrl The URL of the image to parse the SVG from.
* @brief Parses the SVG Image from the set URL.
*
* @param[in] imageUrl The URL of the image to parse the SVG from.
- * @param[in] size The required size of the SVG
*/
*/
- void ParseFromUrl( const
std::string& imageUrl, ImageDimensions size = ImageDimensions()
);
+ void ParseFromUrl( const
VisualUrl& imageUrl
);
/**
* @bried Rasterize the svg with the given size, and add it to the visual.
/**
* @bried Rasterize the svg with the given size, and add it to the visual.
@@
-155,6
+155,13
@@
private:
*/
void AddRasterizationTask( const Vector2& size );
*/
void AddRasterizationTask( const Vector2& size );
+ /**
+ * 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 );
+
// Undefined
SvgVisual( const SvgVisual& svgRenderer );
// Undefined
SvgVisual( const SvgVisual& svgRenderer );
@@
-164,10
+171,11
@@
private:
private:
Vector4 mAtlasRect;
private:
Vector4 mAtlasRect;
-
std::string
mImageUrl;
+
VisualUrl
mImageUrl;
NSVGimage* mParsedImage;
WeakHandle<Actor> mPlacementActor;
NSVGimage* mParsedImage;
WeakHandle<Actor> mPlacementActor;
-
+ Vector2 mVisualSize;
+ bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture
};
} // namespace Internal
};
} // namespace Internal