From: huiyueun <35286162+huiyueun@users.noreply.github.com>
Date: Tue, 2 Jul 2019 23:22:41 +0000 (+0900)
Subject: [NUI] Fix ImageView bug (#917)
X-Git-Tag: submit/tizen/20190703.094500~1^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=367810c0f6c42e816c0504ae7ad8b1f774f681fb;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI] Fix ImageView bug (#917)

Fix VD pin popup issue

Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
---

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
index 9c9650c00..38b764c62 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@ -41,6 +41,7 @@ namespace Tizen.NUI.BaseComponents
                 string resource = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
                 url = url.Replace("*Resource*", resource);
             }
+            imageView._resourceUrl = url;
             imageView.UpdateImage(ImageVisualProperty.URL, new PropertyValue(url));
         },
         defaultValueCreator: (bindable) =>
@@ -158,9 +159,12 @@ namespace Tizen.NUI.BaseComponents
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly BindableProperty BorderProperty = BindableProperty.Create("Border", typeof(Rectangle), typeof(ImageView), null, propertyChanged: (bindable, oldValue, newValue) =>
         {
-            var imageView = (ImageView)bindable;
-            imageView._border = (Rectangle)newValue;
-            imageView.UpdateImage(NpatchImageVisualProperty.Border, new PropertyValue(imageView._border));
+            if(newValue != null)
+            {
+                var imageView = (ImageView)bindable;
+                imageView._border = (Rectangle)newValue;
+                imageView.UpdateImage(NpatchImageVisualProperty.Border, new PropertyValue(imageView._border));
+            }
         },
         defaultValueCreator: (bindable) =>
         {
@@ -237,6 +241,7 @@ namespace Tizen.NUI.BaseComponents
         private _resourceLoadedCallbackType _resourceLoadedCallback;
 
         private Rectangle _border;
+        private string _resourceUrl = "";
 
         /// <summary>
         /// Creates an initialized ImageView.
@@ -903,22 +908,28 @@ namespace Tizen.NUI.BaseComponents
 			
             SetProperty(ImageView.Property.IMAGE, new PropertyValue(imageMap));
         }
-
+		
         private void UpdateImage(int key, PropertyValue value)
         {
             PropertyMap temp = new PropertyMap();
 
+            if (_resourceUrl == "")
+            {
+                temp.Insert(ImageVisualProperty.URL, new PropertyValue(_resourceUrl));
+                SetProperty(ImageView.Property.IMAGE, new PropertyValue(temp));
+                return;
+            }
+
             if (_border == null)
             {
                 temp.Insert(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image));
-                temp.Insert(NpatchImageVisualProperty.BorderOnly, new PropertyValue(false));
-                temp.Insert(NpatchImageVisualProperty.Border, new PropertyValue(new Rectangle(0, 0, 0, 0)));
             }
             else
             {
                 temp.Insert(Visual.Property.Type, new PropertyValue((int)Visual.Type.NPatch));
+                temp.Insert(NpatchImageVisualProperty.Border, new PropertyValue(_border));
             }
-
+        
             if (value != null)
             {
                 temp.Insert(key, value);
@@ -930,6 +941,7 @@ namespace Tizen.NUI.BaseComponents
             temp = null;
         }
 
+
         private void OnResourceLoaded(IntPtr view)
         {
             ResourceLoadedEventArgs e = new ResourceLoadedEventArgs();