[NUI] Remove the unused resource-change callback. (#414)
authorXianbing Teng <xb.teng@samsung.com>
Fri, 24 Aug 2018 10:03:25 +0000 (18:03 +0800)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Fri, 24 Aug 2018 10:03:25 +0000 (19:03 +0900)
src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs
src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
src/Tizen.NUI/src/public/BaseComponents/View.cs

index 7d168b9..1e759f3 100755 (executable)
@@ -88,9 +88,17 @@ namespace Tizen.NUI.Xaml
                     if (value == null)
                     {
                         value = Activator.CreateInstance(type);
-                        if (value is BindableObject)
+                        if (value is Element)
                         {
-                            ((BindableObject)value).IsCreateByXaml = true;
+                            if (null != Application.Current)
+                            {
+                                Application.AddResourceChangedCallback(value, (value as Element).OnResourcesChanged);
+                            }
+
+                            if (value is BindableObject)
+                            {
+                                ((BindableObject)value).IsCreateByXaml = true;
+                            }
                         }
                     }
                 }
@@ -200,9 +208,17 @@ namespace Tizen.NUI.Xaml
             {
                 //non-default ctor
                 object ret = Activator.CreateInstance(nodeType, arguments);
-                if (ret is BindableObject)
+                if (ret is Element)
                 {
-                    ((BindableObject)ret).IsCreateByXaml = true;
+                    if (null != Application.Current)
+                    {
+                        Application.AddResourceChangedCallback(ret, (ret as Element).OnResourcesChanged);
+                    }
+
+                    if (ret is BindableObject)
+                    {
+                        ((BindableObject)ret).IsCreateByXaml = true;
+                    }
                 }
                 return ret;
             }
@@ -304,9 +320,17 @@ namespace Tizen.NUI.Xaml
             else
             {
                 value = Activator.CreateInstance(nodeType);
-                if (value is BindableObject)
+                if (value is Element)
                 {
-                    ((BindableObject)value).IsCreateByXaml = true;
+                    if (null != Application.Current)
+                    {
+                        Application.AddResourceChangedCallback(value, (value as Element).OnResourcesChanged);
+                    }
+
+                    if (value is BindableObject)
+                    {
+                        ((BindableObject)value).IsCreateByXaml = true;
+                    }
                 }
             }
 
index e8cd9fc..b7fe237 100755 (executable)
@@ -319,7 +319,6 @@ namespace Tizen.NUI.BaseComponents
         /// <since_tizen> 3 </since_tizen>
         public ImageView() : this(NDalicPINVOKE.ImageView_New__SWIG_0(), true)
         {
-            base.InitXamlResource();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
index 59ee3cb..7a8dce5 100755 (executable)
@@ -2453,26 +2453,16 @@ namespace Tizen.NUI.BaseComponents
             PageDown
         }
 
-        protected void InitXamlResource()
-        {
-            if (null != Application.Current)
-            {
-                Application.AddResourceChangedCallback(this, OnResourcesChanged);
-            }
-        }
-
         /// <summary>
         /// Creates a new instance of a view.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
         public View() : this(NDalicPINVOKE.View_New(), true)
         {
-            InitXamlResource();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
         internal View(View uiControl) : this(NDalicPINVOKE.new_View__SWIG_1(View.getCPtr(uiControl)), true)
         {
-            InitXamlResource();
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }