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
System font family change to update font in TextField
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.h
diff --git
a/dali-toolkit/internal/text/text-controller.h
b/dali-toolkit/internal/text/text-controller.h
index
99c2ab0
..
fa4f966
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.h
+++ b/
dali-toolkit/internal/text/text-controller.h
@@
-178,8
+178,9
@@
public:
* @brief Set the default font family.
*
* @param[in] defaultFontFamily The default font family.
* @brief Set the default font family.
*
* @param[in] defaultFontFamily The default font family.
+ * @param[in] userDefined If set by the user
*/
*/
- void SetDefaultFontFamily( const std::string& defaultFontFamily );
+ void SetDefaultFontFamily( const std::string& defaultFontFamily
, bool userDefined
);
/**
* @brief Retrieve the default font family.
/**
* @brief Retrieve the default font family.
@@
-217,6
+218,12
@@
public:
float GetDefaultPointSize() const;
/**
float GetDefaultPointSize() const;
/**
+ * @ brief Update the text after a font change
+ * @param[in] newDefaultFont The new font to change to
+ */
+ void UpdateAfterFontChange( std::string& newDefaultFont );
+
+ /**
* @brief Set the text color
*
* @param textColor The text color
* @brief Set the text color
*
* @param textColor The text color