From 335c796b10c3c20f7424a5d46a70a69225ca12d1 Mon Sep 17 00:00:00 2001
From: Feng Jin <feng16.jin@samsung.com>
Date: Tue, 11 Apr 2017 22:29:40 +0800
Subject: [PATCH] Fix some bugs: (1)Change the return type of
 Window.IsVisible() form void to bool. (2)Change the type of
 PushButton.IconPadding to Vector4. (3)Change some properties in TextEditor
 and TextField to string type.

Change-Id: I15cab04c9a9b846e6d5a1457ed1c3bfd4e26a53a
Signed-off-by: Feng Jin <feng16.jin@samsung.com>
---
 Tizen.NUI/src/public/PushButton.cs |  6 +++---
 Tizen.NUI/src/public/TextEditor.cs | 36 ++++++++++++++++++------------------
 Tizen.NUI/src/public/TextField.cs  | 36 ++++++++++++++++++------------------
 Tizen.NUI/src/public/Window.cs     |  6 ++++--
 4 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/Tizen.NUI/src/public/PushButton.cs b/Tizen.NUI/src/public/PushButton.cs
index 4a22ce2..56783ef 100755
--- a/Tizen.NUI/src/public/PushButton.cs
+++ b/Tizen.NUI/src/public/PushButton.cs
@@ -278,12 +278,12 @@ namespace Tizen.NUI
         /// <summary>
         /// Sets the icon padding value.
         /// </summary>
-        public string IconPadding
+        public Vector4 IconPadding
         {
             get
             {
-                string temp;
-                GetProperty(PushButton.Property.ICON_PADDING).Get(out temp);
+                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
+                GetProperty(PushButton.Property.ICON_PADDING).Get(temp);
                 return temp;
             }
             set
diff --git a/Tizen.NUI/src/public/TextEditor.cs b/Tizen.NUI/src/public/TextEditor.cs
index bb48788..afdd2b4 100755
--- a/Tizen.NUI/src/public/TextEditor.cs
+++ b/Tizen.NUI/src/public/TextEditor.cs
@@ -918,12 +918,12 @@ namespace Tizen.NUI
         /// <summary>
         /// InputUnderline property.
         /// </summary>
-        public PropertyMap InputUnderline
+        public string InputUnderline
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextEditor.Property.INPUT_UNDERLINE).Get(temp);
+                string temp;
+                GetProperty(TextEditor.Property.INPUT_UNDERLINE).Get(out temp);
                 return temp;
             }
             set
@@ -952,12 +952,12 @@ namespace Tizen.NUI
         /// <summary>
         /// InputShadow property.
         /// </summary>
-        public PropertyMap InputShadow
+        public string InputShadow
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextEditor.Property.INPUT_SHADOW).Get(temp);
+                string temp;
+                GetProperty(TextEditor.Property.INPUT_SHADOW).Get(out temp);
                 return temp;
             }
             set
@@ -969,12 +969,12 @@ namespace Tizen.NUI
         /// <summary>
         /// Emboss property.
         /// </summary>
-        public PropertyMap Emboss
+        public string Emboss
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextEditor.Property.EMBOSS).Get(temp);
+                string temp;
+                GetProperty(TextEditor.Property.EMBOSS).Get(out temp);
                 return temp;
             }
             set
@@ -986,12 +986,12 @@ namespace Tizen.NUI
         /// <summary>
         /// InputEmboss property.
         /// </summary>
-        public PropertyMap InputEmboss
+        public string InputEmboss
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextEditor.Property.INPUT_EMBOSS).Get(temp);
+                string temp;
+                GetProperty(TextEditor.Property.INPUT_EMBOSS).Get(out temp);
                 return temp;
             }
             set
@@ -1003,12 +1003,12 @@ namespace Tizen.NUI
         /// <summary>
         /// Outline property.
         /// </summary>
-        public PropertyMap Outline
+        public string Outline
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextEditor.Property.OUTLINE).Get(temp);
+                string temp;
+                GetProperty(TextEditor.Property.OUTLINE).Get(out temp);
                 return temp;
             }
             set
@@ -1020,12 +1020,12 @@ namespace Tizen.NUI
         /// <summary>
         /// InputOutline property.
         /// </summary>
-        public PropertyMap InputOutline
+        public string InputOutline
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextEditor.Property.INPUT_OUTLINE).Get(temp);
+                string temp;
+                GetProperty(TextEditor.Property.INPUT_OUTLINE).Get(out temp);
                 return temp;
             }
             set
diff --git a/Tizen.NUI/src/public/TextField.cs b/Tizen.NUI/src/public/TextField.cs
index f6f0496..66ecf00 100755
--- a/Tizen.NUI/src/public/TextField.cs
+++ b/Tizen.NUI/src/public/TextField.cs
@@ -1121,12 +1121,12 @@ namespace Tizen.NUI
         /// <summary>
         /// InputUnderline property.
         /// </summary>
-        public PropertyMap InputUnderline
+        public string InputUnderline
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextField.Property.INPUT_UNDERLINE).Get(temp);
+                string temp;
+                GetProperty(TextField.Property.INPUT_UNDERLINE).Get(out temp);
                 return temp;
             }
             set
@@ -1155,12 +1155,12 @@ namespace Tizen.NUI
         /// <summary>
         /// InputShadow property.
         /// </summary>
-        public PropertyMap InputShadow
+        public string InputShadow
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextField.Property.INPUT_SHADOW).Get(temp);
+                string temp;
+                GetProperty(TextField.Property.INPUT_SHADOW).Get(out temp);
                 return temp;
             }
             set
@@ -1172,12 +1172,12 @@ namespace Tizen.NUI
         /// <summary>
         /// Emboss property.
         /// </summary>
-        public PropertyMap Emboss
+        public string Emboss
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextField.Property.EMBOSS).Get(temp);
+                string temp;
+                GetProperty(TextField.Property.EMBOSS).Get(out temp);
                 return temp;
             }
             set
@@ -1189,12 +1189,12 @@ namespace Tizen.NUI
         /// <summary>
         /// InputEmboss property.
         /// </summary>
-        public PropertyMap InputEmboss
+        public string InputEmboss
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextField.Property.INPUT_EMBOSS).Get(temp);
+                string temp;
+                GetProperty(TextField.Property.INPUT_EMBOSS).Get(out temp);
                 return temp;
             }
             set
@@ -1206,12 +1206,12 @@ namespace Tizen.NUI
         /// <summary>
         /// Outline property.
         /// </summary>
-        public PropertyMap Outline
+        public string Outline
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextField.Property.OUTLINE).Get(temp);
+                string temp;
+                GetProperty(TextField.Property.OUTLINE).Get(out temp);
                 return temp;
             }
             set
@@ -1223,12 +1223,12 @@ namespace Tizen.NUI
         /// <summary>
         /// InputOutline property.
         /// </summary>
-        public PropertyMap InputOutline
+        public string InputOutline
         {
             get
             {
-                PropertyMap temp = new PropertyMap();
-                GetProperty(TextField.Property.INPUT_OUTLINE).Get(temp);
+                string temp;
+                GetProperty(TextField.Property.INPUT_OUTLINE).Get(out temp);
                 return temp;
             }
             set
diff --git a/Tizen.NUI/src/public/Window.cs b/Tizen.NUI/src/public/Window.cs
index eb741e9..83f66a1 100755
--- a/Tizen.NUI/src/public/Window.cs
+++ b/Tizen.NUI/src/public/Window.cs
@@ -120,10 +120,12 @@ namespace Tizen.NUI
         /// <summary>
         /// Retrieves whether the window is visible or not.
         /// </summary>
-        public void IsVisible()
+        /// <returns>true, if the windoe is visible</returns>
+        public bool IsVisible()
         {
-            NDalicPINVOKE.IsVisible(swigCPtr);
+            bool temp = NDalicPINVOKE.IsVisible(swigCPtr);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return temp;
         }
 
         public class WindowFocusChangedEventArgs : EventArgs
-- 
2.7.4