From bb14cb598d6747484683159b3980a7684c981bf7 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Fri, 11 Aug 2017 14:39:16 +0900 Subject: [PATCH] [Tizen] fix LineWrap GET error Change-Id: Ic56f709f447947c802c39fdec42778f23313db49 Signed-off-by: dongsug.song --- dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp | 8 +++++++- dali-toolkit/internal/controls/text-controls/text-label-impl.cpp | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) mode change 100644 => 100755 dali-toolkit/internal/controls/text-controls/text-label-impl.cpp diff --git a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp index 97cdb82..ca6f5ab 100755 --- a/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-editor-impl.cpp @@ -1116,7 +1116,13 @@ Property::Value TextEditor::GetProperty( BaseObject* object, Property::Index ind { if( impl.mController ) { - value = impl.mController->GetLineWrapMode(); + const char* name = Scripting::GetEnumerationName< Layout::LineWrap::Mode >( impl.mController->GetLineWrapMode(), + LINE_WRAP_MODE_STRING_TABLE, + LINE_WRAP_MODE_STRING_TABLE_COUNT ); + if( name ) + { + value = std::string( name ); + } } } } //switch diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp old mode 100644 new mode 100755 index a6fa7ea..f8265f6 --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -757,7 +757,13 @@ Property::Value TextLabel::GetProperty( BaseObject* object, Property::Index inde { if( impl.mController ) { - value = impl.mController->GetLineWrapMode(); + const char* name = Scripting::GetEnumerationName< Layout::LineWrap::Mode >( impl.mController->GetLineWrapMode(), + LINE_WRAP_MODE_STRING_TABLE, + LINE_WRAP_MODE_STRING_TABLE_COUNT ); + if( name ) + { + value = std::string( name ); + } } break; } -- 2.7.4