From 85978f019f7f4b4bf4a49db7ccd926fec2486696 Mon Sep 17 00:00:00 2001 From: "Jinho, Lee" Date: Thu, 28 Sep 2017 14:33:00 +0900 Subject: [PATCH] [4.0] fix LineWrap GET error This reverts commit 999a1b2425bde68865ec79c05b802ad6af34fa93. Change-Id: Iec859f2300a98b0b61120a67b79268ff94120e95 --- 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 61aaba6..e8fa0ab 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 e871db3..84e648f --- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp @@ -769,7 +769,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