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
3369901
..
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;
@@
-64,7
+65,7
@@
public:
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
* @param[in] properties A Property::Map containing settings for this visual
* @return A smart-pointer to the newly allocated visual.
*/
- static SvgVisualPtr New( VisualFactoryCache& factoryCache, const
std::string
& imageUrl, const Property::Map& properties );
+ 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.
@@
-76,7
+77,7
@@
public:
* @param[in] imageUrl The URL to svg resource to use
* @return A smart-pointer to the newly allocated visual.
*/
* @param[in] imageUrl The URL to svg resource to use
* @return A smart-pointer to the newly allocated visual.
*/
- static SvgVisualPtr New( VisualFactoryCache& factoryCache, const
std::string
& imageUrl );
+ static SvgVisualPtr New( VisualFactoryCache& factoryCache, const
VisualUrl
& imageUrl );
public: // from Visual
public: // from Visual
@@
-145,7
+146,7
@@
private:
*
* @param[in] imageUrl The URL of the image to parse the SVG from.
*/
*
* @param[in] imageUrl The URL of the image to parse the SVG from.
*/
- void ParseFromUrl( const
std::string
& imageUrl );
+ 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.
@@
-154,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 );
@@
-163,10
+171,11
@@
private:
private:
Vector4 mAtlasRect;
private:
Vector4 mAtlasRect;
-
std::string
mImageUrl;
+
VisualUrl
mImageUrl;
NSVGimage* mParsedImage;
WeakHandle<Actor> mPlacementActor;
Vector2 mVisualSize;
NSVGimage* mParsedImage;
WeakHandle<Actor> mPlacementActor;
Vector2 mVisualSize;
+ bool mAttemptAtlasing; ///< If true will attempt atlasing, otherwise create unique texture
};
} // namespace Internal
};
} // namespace Internal