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 KeyboardFocus History Stack" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
text
/
text-visual.h
diff --git
a/dali-toolkit/internal/visuals/text/text-visual.h
b/dali-toolkit/internal/visuals/text/text-visual.h
index
7cee7bf
..
5ce01ed
100644
(file)
--- a/
dali-toolkit/internal/visuals/text/text-visual.h
+++ b/
dali-toolkit/internal/visuals/text/text-visual.h
@@
-71,16
+71,17
@@
public:
* @brief Create a new text visual.
*
* @param[in] factoryCache A pointer pointing to the VisualFactoryCache object
* @brief Create a new text 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 TextVisualPtr New( VisualFactoryCache& factoryCache );
+ static TextVisualPtr New( VisualFactoryCache& factoryCache
, const Property::Map& properties
);
public: // from Visual::Base
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
public: // from Visual::Base
/**
* @copydoc Visual::Base::GetHeightForWidth()
*/
- virtual float GetHeightForWidth( float width )
const
;
+ virtual float GetHeightForWidth( float width );
/**
* @copydoc Visual::Base::GetNaturalSize()
/**
* @copydoc Visual::Base::GetNaturalSize()