[NUI] fix Image property URL update issue

Change-Id: Id2dbdc11923a360832122f9567303db7911f889f
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
index 90d8321..954f9ee 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@ -289,6 +289,7 @@ namespace Tizen.NUI.BaseComponents
             {
                 if (_border == null)
                 {
+                    if (_url != null) { value.Add("url", new PropertyValue(_url)); }
                     SetProperty(ImageView.Property.IMAGE, new Tizen.NUI.PropertyValue(value));
                 }
             }
@@ -317,6 +318,7 @@ namespace Tizen.NUI.BaseComponents
             {
                 if (_border == null)
                 {
+                    if(_url != null) { value.Add("url", new PropertyValue(_url)); }
                     SetProperty(ImageView.Property.IMAGE, new Tizen.NUI.PropertyValue(value));
                 }
             }

diff --git a/test/NUITestSample/NUITestSample/examples/ImageViewUserShaderTest2.cs b/test/NUITestSample/NUITestSample/examples/ImageViewUserShaderTest2.cs
index 41a7f4b..c4298e4 100755 (executable)
--- a/test/NUITestSample/NUITestSample/examples/ImageViewUserShaderTest2.cs
+++ b/test/NUITestSample/NUITestSample/examples/ImageViewUserShaderTest2.cs
@@ -38,6 +38,7 @@ namespace ImageViewUserShaderTest2
         private ImageView myImageView;
         private int count = 0;
         private bool changeImgResource = true;
+        static string res = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
 
         protected override void OnCreate()
         {
@@ -52,11 +53,11 @@ namespace ImageViewUserShaderTest2
 
             Window.Instance.GetDefaultLayer().Add(myView);
 
-            myImageView = new ImageView();
+            myImageView = new ImageView(@res + @"/images/star-dim.png");
             myImageView.Size2D = new Size2D(96, 96);
             myImageView.Position2D = new Position2D(400, 400);
 
-            ChangePropertyMap(Color.Red, @"/home/owner/apps_rw/org.tizen.example.NUITestSample/res/images/mask.png");
+            ChangePropertyMap(Color.Red);
 
             Window.Instance.GetDefaultLayer().Add(myImageView);
 
@@ -74,16 +75,16 @@ namespace ImageViewUserShaderTest2
                         case 0:
                             if (changeImgResource)
                             {
-                                //myImageView.SetImage(@"/home/owner/apps_rw/org.tizen.example.NUITestSample/res/images/mask.png");
+                                myImageView.SetImage(@res + @"/images/mask.png");
                             }
-                            ChangePropertyMap(Color.Blue, @"/home/owner/apps_rw/org.tizen.example.NUITestSample/res/images/mask.png");
+                            ChangePropertyMap(Color.Blue);
                             break;
                         case 1:
                             if (changeImgResource)
                             {
-                                //myImageView.SetImage(@"/home/owner/apps_rw/org.tizen.example.NUITestSample/res/images/star-dim.png");
+                                myImageView.SetImage(@res + @"/images/star-dim.png");
                             }
-                            ChangePropertyMap(Color.Yellow, @"/home/owner/apps_rw/org.tizen.example.NUITestSample/res/images/star-dim.png");
+                            ChangePropertyMap(Color.Green);
                             break;
                     }
                 }
@@ -92,14 +93,13 @@ namespace ImageViewUserShaderTest2
             return false;
         }
 
-        private void ChangePropertyMap(Color color, string url)
+        private void ChangePropertyMap(Color color)
         {
             PropertyMap shaderMap = new PropertyMap();
             shaderMap.Add("vertexShader", new PropertyValue(vertexShader));
             shaderMap.Add("fragmentShader", new PropertyValue(fragmentShader));
 
             PropertyMap imageMap = new PropertyMap();
-            imageMap.Add("url", new PropertyValue(url));
             imageMap.Add("shader", new PropertyValue(shaderMap));
             myImageView.Image = imageMap;