From 7210a4d9f09f13de444cabcdc69998744a9c19f0 Mon Sep 17 00:00:00 2001 From: "huiyu,eun" Date: Wed, 22 Nov 2017 20:08:13 +0900 Subject: [PATCH 1/1] [NUI] Fix LineWrapMode issue Change-Id: Iec6b63b6d5a979a44b602b96cef221997e766589 Signed-off-by: huiyu,eun --- .../src/public/BaseComponents/TextEditor.cs | 28 +++------------------- .../src/public/BaseComponents/TextLabel.cs | 28 +++------------------- 2 files changed, 6 insertions(+), 50 deletions(-) diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 3702169..e4fd298 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -1415,38 +1415,16 @@ namespace Tizen.NUI.BaseComponents { get { - string temp; + int temp; if(GetProperty(TextEditor.Property.LINE_WRAP_MODE).Get(out temp) == false) { NUILog.Error("LineWrapMode get error!"); } - switch (temp) - { - case "WRAP_MODE_WORD": - return LineWrapMode.Word; - case "WRAP_MODE_CHARACTER": - return LineWrapMode.Character; - default: - return LineWrapMode.Word; - } + return (LineWrapMode)temp; } set { - string temp = ""; - switch (value) - { - case LineWrapMode.Word: - { - temp = "WRAP_MODE_WORD"; - break; - } - case LineWrapMode.Character: - { - temp = "WRAP_MODE_CHARACTER"; - break; - } - } - SetProperty(TextEditor.Property.LINE_WRAP_MODE, new Tizen.NUI.PropertyValue(temp)); + SetProperty(TextEditor.Property.LINE_WRAP_MODE, new Tizen.NUI.PropertyValue((int)value)); } } diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index 3d685f5..6ddfd6b 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -822,38 +822,16 @@ namespace Tizen.NUI.BaseComponents { get { - string temp; + int temp; if(GetProperty(TextLabel.Property.LINE_WRAP_MODE).Get(out temp) == false) { NUILog.Error("LineWrapMode get error!"); } - switch (temp) - { - case "WRAP_MODE_WORD": - return LineWrapMode.Word; - case "WRAP_MODE_CHARACTER": - return LineWrapMode.Character; - default: - return LineWrapMode.Word; - } + return (LineWrapMode)temp; } set { - string temp = ""; - switch (value) - { - case LineWrapMode.Word: - { - temp = "WRAP_MODE_WORD"; - break; - } - case LineWrapMode.Character: - { - temp = "WRAP_MODE_CHARACTER"; - break; - } - } - SetProperty(TextLabel.Property.LINE_WRAP_MODE, new Tizen.NUI.PropertyValue(temp)); + SetProperty(TextLabel.Property.LINE_WRAP_MODE, new Tizen.NUI.PropertyValue((int)value)); } } } -- 2.7.4