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
[dali_1.3.4] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-font-style.h
diff --git
a/dali-toolkit/internal/text/text-font-style.h
b/dali-toolkit/internal/text/text-font-style.h
index
e74bcfb
..
4a01d32
100644
(file)
--- a/
dali-toolkit/internal/text/text-font-style.h
+++ b/
dali-toolkit/internal/text/text-font-style.h
@@
-83,8
+83,9
@@
namespace FontStyle
{
enum Type
{
{
enum Type
{
- DEFAULT, ///< The default font's style.
- INPUT ///< The input font's style.
+ DEFAULT, ///< The default font's style.
+ INPUT, ///< The input font's style.
+ PLACEHOLDER ///< The placeholder text font's style.
};
};
};
};
@@
-101,7
+102,7
@@
void SetFontFamilyProperty( ControllerPtr controller, const Property::Value& val
*
* @param[in] controller The text's controller.
* @param[in] value The value of the font's style.
*
* @param[in] controller The text's controller.
* @param[in] value The value of the font's style.
- * @param[in] type Whether the property is for the default font's style
or the input
font's style.
+ * @param[in] type Whether the property is for the default font's style
, the input font's style or the placeholder
font's style.
*
*/
void SetFontStyleProperty( ControllerPtr controller, const Property::Value& value, FontStyle::Type type );
*
*/
void SetFontStyleProperty( ControllerPtr controller, const Property::Value& value, FontStyle::Type type );
@@
-111,7
+112,7
@@
void SetFontStyleProperty( ControllerPtr controller, const Property::Value& valu
*
* @param[in] controller The text's controller.
* @param[out] value The value of the font's style.
*
* @param[in] controller The text's controller.
* @param[out] value The value of the font's style.
- * @param[in] type Whether the property is for the default font's style
or the input
font's style.
+ * @param[in] type Whether the property is for the default font's style
, the input font's style or the placeholder
font's style.
*/
void GetFontStyleProperty( ControllerPtr controller, Property::Value& value, FontStyle::Type type );
*/
void GetFontStyleProperty( ControllerPtr controller, Property::Value& value, FontStyle::Type type );