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 "fix ellipsis not working issue when the given width is too narrow" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-view.h
diff --git
a/dali-toolkit/internal/text/text-view.h
b/dali-toolkit/internal/text/text-view.h
index
91b7867
..
e600940
100755
(executable)
--- a/
dali-toolkit/internal/text/text-view.h
+++ b/
dali-toolkit/internal/text/text-view.h
@@
-58,17
+58,17
@@
public:
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetControlSize()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetControlSize()
*/
-
virtual const Vector2& GetControlSize() const
;
+
const Vector2& GetControlSize() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetLayoutSize()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetLayoutSize()
*/
-
virtual const Vector2& GetLayoutSize() const
;
+
const Vector2& GetLayoutSize() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfGlyphs()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfGlyphs()
*/
-
virtual Length GetNumberOfGlyphs() const
;
+
Length GetNumberOfGlyphs() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphs()
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphs()
@@
-82,57
+82,57
@@
public:
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetColors()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetColors()
*/
-
virtual const Vector4* const GetColors() const
;
+
const Vector4* const GetColors() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetColorIndices()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetColorIndices()
*/
-
virtual const ColorIndex* const GetColorIndices() const
;
+
const ColorIndex* const GetColorIndices() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetBackgroundColors()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetBackgroundColors()
*/
-
virtual const Vector4* const GetBackgroundColors() const
;
+
const Vector4* const GetBackgroundColors() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetBackgroundColorIndices()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetBackgroundColorIndices()
*/
-
virtual const ColorIndex* const GetBackgroundColorIndices() const
;
+
const ColorIndex* const GetBackgroundColorIndices() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetTextColor()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetTextColor()
*/
-
virtual const Vector4& GetTextColor() const
;
+
const Vector4& GetTextColor() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetShadowOffset()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetShadowOffset()
*/
-
virtual const Vector2& GetShadowOffset() const
;
+
const Vector2& GetShadowOffset() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetShadowColor()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetShadowColor()
*/
-
virtual const Vector4& GetShadowColor() const
;
+
const Vector4& GetShadowColor() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineColor()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineColor()
*/
-
virtual const Vector4& GetUnderlineColor() const
;
+
const Vector4& GetUnderlineColor() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::IsUnderlineEnabled()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::IsUnderlineEnabled()
*/
-
virtual bool IsUnderlineEnabled() const
;
+
bool IsUnderlineEnabled() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineHeight()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineHeight()
*/
-
virtual float GetUnderlineHeight() const
;
+
float GetUnderlineHeight() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfUnderlineRuns()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetNumberOfUnderlineRuns()
*/
-
virtual Length GetNumberOfUnderlineRuns() const
;
+
Length GetNumberOfUnderlineRuns() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineRuns()
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetUnderlineRuns()
@@
-144,12
+144,12
@@
public:
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetOutlineColor()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetOutlineColor()
*/
-
virtual const Vector4& GetOutlineColor() const
;
+
const Vector4& GetOutlineColor() const override
;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetOutlineWidth()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetOutlineWidth()
*/
-
virtual uint16_t GetOutlineWidth() const
;
+
uint16_t GetOutlineWidth() const override
;
private:
private: