[dali_2.1.5] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / text-enumerations-impl.cpp

diff --git a/dali-toolkit/internal/text/text-enumerations-impl.cpp b/dali-toolkit/internal/text/text-enumerations-impl.cpp
index 11ff5c6..0296dfd 100644 (file)
--- a/dali-toolkit/internal/text/text-enumerations-impl.cpp
+++ b/dali-toolkit/internal/text/text-enumerations-impl.cpp
@@ -48,6 +48,18 @@ DALI_ENUM_TO_STRING_TABLE_BEGIN(LINE_WRAP_MODE)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Text::LineWrap, WORD)
   DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Text::LineWrap, CHARACTER)
 DALI_ENUM_TO_STRING_TABLE_END(LINE_WRAP_MODE)
+
+DALI_ENUM_TO_STRING_TABLE_BEGIN(ELLIPSIS_POSITION_TYPE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::DevelText::EllipsisPosition, END)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::DevelText::EllipsisPosition, START)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::DevelText::EllipsisPosition, MIDDLE)
+DALI_ENUM_TO_STRING_TABLE_END(ELLIPSIS_POSITION_TYPE)
+
+DALI_ENUM_TO_STRING_TABLE_BEGIN(UNDERLINE_TYPE)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Text::Underline::Type, SOLID)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Text::Underline::Type, DASHED)
+  DALI_ENUM_TO_STRING_WITH_SCOPE(Toolkit::Text::Underline::Type, DOUBLE)
+DALI_ENUM_TO_STRING_TABLE_END(UNDERLINE_TYPE)
 } // namespace
 
 bool GetHorizontalAlignmentEnumeration(const Property::Value& propertyValue, Toolkit::Text::HorizontalAlignment::Type& alignment)
@@ -79,6 +91,18 @@ const char* GetVerticalAlignmentString(const Toolkit::Text::VerticalAlignment::T
                                                                                      VERTICAL_ALIGNMENT_TYPE_TABLE_COUNT);
 }
 
+bool GetEllipsisPositionTypeEnumeration(const Property::Value& propertyValue, Toolkit::DevelText::EllipsisPosition::Type& ellipsisPositionType)
+{
+  return Scripting::GetEnumerationProperty(propertyValue, ELLIPSIS_POSITION_TYPE_TABLE, ELLIPSIS_POSITION_TYPE_TABLE_COUNT, ellipsisPositionType);
+}
+
+const char* GetUnderlineTypeToString(const Toolkit::Text::Underline::Type& type)
+{
+  return Scripting::GetLinearEnumerationName<Toolkit::Text::Underline::Type>(type,
+                                                                             UNDERLINE_TYPE_TABLE,
+                                                                             UNDERLINE_TYPE_TABLE_COUNT);
+}
+
 } // namespace Text
 
 } // namespace Toolkit