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
Add PIXEL_SIZE and ELLIPSIS property in text-controls
[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
96856ef
..
7301e70
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller.h
+++ b/
dali-toolkit/internal/text/text-controller.h
@@
-121,6
+121,15
@@
public: // Enumerated types.
PLACEHOLDER_TYPE_INACTIVE,
};
PLACEHOLDER_TYPE_INACTIVE,
};
+ /**
+ * @brief Enumeration for Font Size Type.
+ */
+ enum FontSizeType
+ {
+ POINT_SIZE, // The size of font in points.
+ PIXEL_SIZE // The size of font in pixels.
+ };
+
struct NoTextTap
{
enum Action
struct NoTextTap
{
enum Action
@@
-502,18
+511,20
@@
public: // Default style & Input style
FontSlant GetDefaultFontSlant() const;
/**
FontSlant GetDefaultFontSlant() const;
/**
- * @brief Set the default
poi
nt size.
+ * @brief Set the default
fo
nt size.
*
*
- * @param[in] pointSize The default point size.
+ * @param[in] size The default font size.
+ * @param[in] type The font size type is point size or pixel size
*/
*/
- void SetDefault
PointSize( float pointSiz
e );
+ void SetDefault
FontSize( float fontSize, FontSizeType typ
e );
/**
* @brief Retrieve the default point size.
*
/**
* @brief Retrieve the default point size.
*
+ * @param[in] type The font size type
* @return The default point size.
*/
* @return The default point size.
*/
- float GetDefault
PointSize(
) const;
+ float GetDefault
FontSize( FontSizeType type
) const;
/**
* @brief Sets the text's default color.
/**
* @brief Sets the text's default color.