From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 11 Sep 2017 08:56:10 +0000 (+0900)
Subject: [4.0] fix LineWrap GET error
X-Git-Tag: accepted/tizen/4.0/unified/20170918.093549~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F149000%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[4.0] fix LineWrap GET error

Change-Id: Ic7fecb1fc7480e90c412ea91beb98f74caad89d0
---

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 db99cc4..b670b67
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -760,7 +760,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;
       }