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
Merge "Add ImageVisualShaderFactory" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-factory-cache.h
diff --git
a/dali-toolkit/internal/visuals/visual-factory-cache.h
b/dali-toolkit/internal/visuals/visual-factory-cache.h
index
bb4744c
..
f2c8120
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-factory-cache.h
+++ b/
dali-toolkit/internal/visuals/visual-factory-cache.h
@@
-68,7
+68,6
@@
public:
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
NINE_PATCH_MASK_SHADER,
IMAGE_SHADER_ATLAS_CUSTOM_WRAP,
NINE_PATCH_SHADER,
NINE_PATCH_MASK_SHADER,
- SVG_SHADER,
TEXT_SHADER_MULTI_COLOR_TEXT,
TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
TEXT_SHADER_SINGLE_COLOR_TEXT,
TEXT_SHADER_MULTI_COLOR_TEXT,
TEXT_SHADER_MULTI_COLOR_TEXT_WITH_STYLE,
TEXT_SHADER_SINGLE_COLOR_TEXT,
@@
-161,7
+160,7
@@
public:
* @brief Returns an image to be used when a visual has failed to correctly render
* @return The broken image handle.
*/
* @brief Returns an image to be used when a visual has failed to correctly render
* @return The broken image handle.
*/
-
static
Image GetBrokenVisualImage();
+ Image GetBrokenVisualImage();
/**
* @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
/**
* @copydoc Toolkit::VisualFactory::SetPreMultiplyOnLoad()
@@
-173,6
+172,12
@@
public:
*/
bool GetPreMultiplyOnLoad();
*/
bool GetPreMultiplyOnLoad();
+ /**
+ * @brief Set an image to be used when a visual has failed to correctly render
+ * @param[in] brokenImageUrl The broken image url.
+ */
+ void SetBrokenImageUrl(const std::string& brokenImageUrl);
+
public:
/**
* Get the image atlas manager.
public:
/**
* Get the image atlas manager.
@@
-225,6
+230,7
@@
private:
TextureManager mTextureManager;
NPatchLoader mNPatchLoader;
SvgRasterizeThread* mSvgRasterizeThread;
TextureManager mTextureManager;
NPatchLoader mNPatchLoader;
SvgRasterizeThread* mSvgRasterizeThread;
+ std::string mBrokenImageUrl;
bool mPreMultiplyOnLoad;
};
bool mPreMultiplyOnLoad;
};