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 "Don't count '\r' in text-field" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
gradient
/
gradient-visual.h
diff --git
a/dali-toolkit/internal/visuals/gradient/gradient-visual.h
b/dali-toolkit/internal/visuals/gradient/gradient-visual.h
index
351e772
..
9c84cf2
100644
(file)
--- a/
dali-toolkit/internal/visuals/gradient/gradient-visual.h
+++ b/
dali-toolkit/internal/visuals/gradient/gradient-visual.h
@@
-88,9
+88,10
@@
public:
* @brief Create a new gradient visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Create a new gradient visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
+ * @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 GradientVisualPtr New( VisualFactoryCache& factoryCache );
+ static GradientVisualPtr New( VisualFactoryCache& factoryCache
, const Property::Map& properties
);
public: // from Visual
public: // from Visual
@@
-100,14
+101,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: