From 3f6d4c32c9cad3068c45f43cf6f029058e2d2b3e Mon Sep 17 00:00:00 2001
From: dongsug-song <35130733+dongsug-song@users.noreply.github.com>
Date: Thu, 30 Jan 2020 12:19:39 +0900
Subject: [PATCH] [NUI] Fix AlphaMaskUrl setting order problem (#1348)

---
 src/Tizen.NUI/src/public/BaseComponents/ImageView.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
index 9b1ab64..a6108bf 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@ -241,6 +241,7 @@ namespace Tizen.NUI.BaseComponents
         private Rectangle _border;
         private string _resourceUrl = "";
         private bool _synchronosLoading = false;
+        private string _alphaMaskUrl = null;
 
         /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -726,6 +727,7 @@ namespace Tizen.NUI.BaseComponents
                 Tizen.NUI.Object.GetProperty(swigCPtr, ImageView.Property.IMAGE).Get(imageMap);
                 imageMap?.Find(ImageVisualProperty.AlphaMaskURL)?.Get(out ret);
 
+                _alphaMaskUrl = ret;
                 return ret;
             }
             set
@@ -735,6 +737,7 @@ namespace Tizen.NUI.BaseComponents
                     value = "";
                 }
 
+                _alphaMaskUrl = value;
                 UpdateImage(ImageVisualProperty.AlphaMaskURL, new PropertyValue(value));
             }
         }
@@ -1035,6 +1038,11 @@ namespace Tizen.NUI.BaseComponents
         {
             PropertyMap temp = new PropertyMap();
 
+            if(_alphaMaskUrl != null)
+            {
+                temp.Insert(ImageVisualProperty.AlphaMaskURL, new PropertyValue(_alphaMaskUrl));
+            }
+
             if (_resourceUrl == "")
             {
                 temp.Insert(ImageVisualProperty.URL, new PropertyValue(_resourceUrl));
-- 
2.7.4