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
Fix markup underline, strikethrough in overlay style
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-model.h
diff --git
a/dali-toolkit/internal/text/text-model.h
b/dali-toolkit/internal/text/text-model.h
index
416df17
..
a3a42a2
100644
(file)
--- a/
dali-toolkit/internal/text/text-model.h
+++ b/
dali-toolkit/internal/text/text-model.h
@@
-205,6
+205,11
@@
public:
bool IsUnderlineEnabled() const override;
/**
bool IsUnderlineEnabled() const override;
/**
+ * @copydoc ModelInterface::IsMarkupUnderlineSet()
+ */
+ bool const IsMarkupUnderlineSet() const override;
+
+ /**
* @copydoc ModelInterface::GetUnderlineHeight()
*/
float GetUnderlineHeight() const override;
* @copydoc ModelInterface::GetUnderlineHeight()
*/
float GetUnderlineHeight() const override;
@@
-274,11
+279,26
@@
public:
*/
Length GetHyphensCount() const override;
*/
Length GetHyphensCount() const override;
+ /**
+ * @copydoc ModelInterface::GetStrikethroughHeight()
+ */
float GetStrikethroughHeight() const override;
float GetStrikethroughHeight() const override;
+ /**
+ * @copydoc ModelInterface::GetStrikethroughColor()
+ */
const Vector4& GetStrikethroughColor() const override;
const Vector4& GetStrikethroughColor() const override;
+ /**
+ * @copydoc ModelInterface::IsStrikethroughEnabled()
+ */
bool IsStrikethroughEnabled() const override;
bool IsStrikethroughEnabled() const override;
+
+ /**
+ * @copydoc ModelInterface::IsMarkupStrikethroughSet()
+ */
+ bool const IsMarkupStrikethroughSet() const override;
+
/**
* @copydoc ModelInterface::GetCharacterSpacing()
*/
/**
* @copydoc ModelInterface::GetCharacterSpacing()
*/