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 "Fixed texture-manager crash for async load complete" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
border
/
border-visual.h
diff --git
a/dali-toolkit/internal/visuals/border/border-visual.h
b/dali-toolkit/internal/visuals/border/border-visual.h
index
3fce5d6
..
473080b
100644
(file)
--- a/
dali-toolkit/internal/visuals/border/border-visual.h
+++ b/
dali-toolkit/internal/visuals/border/border-visual.h
@@
-56,9
+56,10
@@
public:
* @brief Create a new border visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Create a new border 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 BorderVisualPtr New( VisualFactoryCache& factoryCache );
+ static BorderVisualPtr New( VisualFactoryCache& factoryCache
, const Property::Map& properties
);
protected:
protected:
@@
-75,9
+76,9
@@
protected:
virtual ~BorderVisual();
/**
virtual ~BorderVisual();
/**
- * @copydoc Visual::Base::Do
Initialize
+ * @copydoc Visual::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
@@
-90,14
+91,14
@@
protected:
virtual void DoCreatePropertyMap( Property::Map& map ) const;
/**
virtual void DoCreatePropertyMap( Property::Map& map ) const;
/**
- * @copydoc Visual::Base::
DoSetProperty
+ * @copydoc Visual::Base::
CreateInstancePropertyMap
*/
*/
- virtual void Do
SetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue )
;
+ virtual void Do
CreateInstancePropertyMap( Property::Map& map ) const
;
/**
/**
- * @copydoc Visual::Base::
DoGetProperty
+ * @copydoc Visual::Base::
OnSetTransform
*/
*/
- virtual
Dali::Property::Value DoGetProperty( Dali::Property::Index index
);
+ virtual
void OnSetTransform(
);
public:
public:
@@
-138,6
+139,13
@@
private:
*/
Geometry CreateBorderGeometry();
*/
Geometry CreateBorderGeometry();
+ /**
+ * 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
BorderVisual( const BorderVisual& borderRenderer );
// Undefined
BorderVisual( const BorderVisual& borderRenderer );