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
Text Alignment Enums now public
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
view-model.h
diff --git
a/dali-toolkit/internal/text/rendering/view-model.h
b/dali-toolkit/internal/text/rendering/view-model.h
old mode 100644
(file)
new mode 100755
(executable)
index
e15fa9c
..
c4e1ec0
--- a/
dali-toolkit/internal/text/rendering/view-model.h
+++ b/
dali-toolkit/internal/text/rendering/view-model.h
@@
-22,6
+22,7
@@
#include <dali/public-api/common/dali-vector.h>
// INTERNAL INCLUDES
#include <dali/public-api/common/dali-vector.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/text/text-enumerations.h>
#include <dali-toolkit/internal/text/text-model-interface.h>
namespace Dali
#include <dali-toolkit/internal/text/text-model-interface.h>
namespace Dali
@@
-74,12
+75,12
@@
public:
/**
* @copydoc ModelInterface::GetHorizontalAlignment()
*/
/**
* @copydoc ModelInterface::GetHorizontalAlignment()
*/
- virtual
Layout::HorizontalAlignment
GetHorizontalAlignment() const;
+ virtual
Text::HorizontalAlignment::Type
GetHorizontalAlignment() const;
/**
* @copydoc ModelInterface::GetVerticalAlignment()
*/
/**
* @copydoc ModelInterface::GetVerticalAlignment()
*/
- virtual
Layout::VerticalAlignment
GetVerticalAlignment() const;
+ virtual
Text::VerticalAlignment::Type
GetVerticalAlignment() const;
/**
* @copydoc ModelInterface::IsTextElideEnabled()
/**
* @copydoc ModelInterface::IsTextElideEnabled()
@@
-172,6
+173,16
@@
public:
virtual void GetUnderlineRuns( GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns ) const;
/**
virtual void GetUnderlineRuns( GlyphRun* underlineRuns, UnderlineRunIndex index, Length numberOfRuns ) const;
/**
+ * @copydoc ModelInterface::GetOutlineColor()
+ */
+ virtual const Vector4& GetOutlineColor() const;
+
+ /**
+ * @copydoc ModelInterface::GetOutlineWidth()
+ */
+ virtual float GetOutlineWidth() const;
+
+ /**
* @brief Does the text elide.
*
* It stores a copy of the visible glyphs and removes as many glyphs as needed
* @brief Does the text elide.
*
* It stores a copy of the visible glyphs and removes as many glyphs as needed