[NUI] Layout: Fixed disposed bug and removed RegisterChildProperties API usage (...

* [NUI] Fixed disposed bug and removed RegisterChildProperties API usage

* [NUI] dali_1.3.28, nui internal version 502 update

diff --git a/packaging/version.txt b/packaging/version.txt
index a3e8c8360275b91a3dfd8905fe21354cbe46c35b..8369f9fbecf52605dc09d0bb08f14d9569d218fc 100755 (executable)
--- a/packaging/version.txt
+++ b/packaging/version.txt
@@ -7,4 +7,4 @@ NUGET_VERSION=5.0.0-preview1-99999
 INTERNAL_NUGET_VERSION=5.0.0.999
 
 # RPM Version Suffix
-RPM_VERSION_SUFFIX=nui501
+RPM_VERSION_SUFFIX=nui502

diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapper.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapper.cs
index 1769bfcd4382c3aa80357667c699b1c68ec3e88c..cf4cef100160ce10c1793b93975e9ac740dfd7bc 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapper.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapper.cs
@@ -68,7 +68,7 @@ namespace Tizen.NUI
                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
             }
 
-            base.Dispose();
+            base.Dispose(type);
         }
 
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.

diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapperImpl.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapperImpl.cs
index ea41da14d4de4f7430fcadc23870603f914bce51..37bb101ba9d0c3af1c0484d8b080ffbc8aecc9b2 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapperImpl.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutGroupWrapperImpl.cs
@@ -94,7 +94,7 @@ namespace Tizen.NUI
                 }
                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
             }
-            base.Dispose();
+            base.Dispose(type);
         }
 
         internal uint Add(LayoutItemWrapperImpl layoutChild)

diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutItemPtr.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutItemPtr.cs
index 185cc6fe42ecd3215c12b38a7a44b89b0755ca20..70e9ff74d1a56944402bf156d877b071be5a38f5 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutItemPtr.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutItemPtr.cs
@@ -144,12 +144,6 @@ namespace Tizen.NUI
             return ret;
         }
 
-        public void RegisterChildProperties(string containerType)
-        {
-            LayoutPINVOKE.LayoutItemPtr_RegisterChildProperties(swigCPtr, containerType);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
         public void Measure(LayoutMeasureSpec widthMeasureSpec, LayoutMeasureSpec heightMeasureSpec)
         {
             LayoutPINVOKE.LayoutItemPtr_Measure(swigCPtr, LayoutMeasureSpec.getCPtr(widthMeasureSpec), LayoutMeasureSpec.getCPtr(heightMeasureSpec));

diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapper.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapper.cs
index 14061331a32c0be60602a7c9b811944fcc97e82c..bc9dd5b94ed4ca095f5eed4f20fbbb88fd608b65 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapper.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapper.cs
@@ -68,7 +68,7 @@ namespace Tizen.NUI
                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
             }
 
-            base.Dispose();
+            base.Dispose(type);
         }
 
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.

diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapperImpl.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapperImpl.cs
index 3be07bc7902adaf18271a359de01806c3b2cae78..29c4f68dbfa8b38ee2d68db34063115562098ffe 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapperImpl.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutItemWrapperImpl.cs
@@ -68,7 +68,7 @@ namespace Tizen.NUI
                 }
                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
             }
-            base.Dispose();
+            base.Dispose(type);
         }
 
         public LayoutItemWrapperImpl() : this(LayoutPINVOKE.new_LayoutItemWrapperImpl(), true)

diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutPINVOKE.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutPINVOKE.cs
index 9b963abb9b33f92dc4c952d91f2420a1e9a15b8b..3faeb59caede02715e2616b99fea7246871f8238 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutPINVOKE.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutPINVOKE.cs
@@ -293,9 +293,6 @@ namespace Tizen.NUI
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_LayoutItemWrapperImpl_IsLayoutAnimated")]
         public static extern bool LayoutItemWrapperImpl_IsLayoutAnimated(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_LayoutItemWrapperImpl_RegisterChildProperties")]
-        public static extern void LayoutItemWrapperImpl_RegisterChildProperties(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
-
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_LayoutItemWrapperImpl_Measure")]
         public static extern void LayoutItemWrapperImpl_Measure(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
 
@@ -590,9 +587,6 @@ namespace Tizen.NUI
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_LayoutItemPtr_IsLayoutAnimated")]
         public static extern bool LayoutItemPtr_IsLayoutAnimated(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-        [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_LayoutItemPtr_RegisterChildProperties")]
-        public static extern void LayoutItemPtr_RegisterChildProperties(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2);
-
         [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_Dali_LayoutItemPtr_Measure")]
         public static extern void LayoutItemPtr_Measure(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
 

diff --git a/src/Tizen.NUI/src/internal/VersionCheck.cs b/src/Tizen.NUI/src/internal/VersionCheck.cs
index be2801b076c9ea6e7a5497513731420f4b2a60f6..bec34cf828f00276c0695037b799e1794ceb4378 100755 (executable)
--- a/src/Tizen.NUI/src/internal/VersionCheck.cs
+++ b/src/Tizen.NUI/src/internal/VersionCheck.cs
@@ -24,7 +24,8 @@ namespace Tizen.NUI
     internal static class Version
     {
         //from dali_1.3.23 : NUI internal API version 501
-        public const int nuiAPIVer = 501;
+        //from dali_1.3.28 : NUI internal API version 502
+        public const int nuiAPIVer = 502;
         public const int reservedVer1 = 0;
         public const int reservedVer2 = 0;
 
@@ -69,7 +70,7 @@ namespace Tizen.NUI
 
             NDalicManualPINVOKE.NativeVersionCheck(ref ver1, ref ver2, ref ver3);
             //NUILog.Debug($"DALi Version: ({ver1}.{ver2}.{ver3}), NUI API Version: ({nuiAPIVer})");
-            NUILog.Error($"DALi Version: ({ver1}.{ver2}.{ver3}), NUI API Version: ({nuiAPIVer})");
+            NUILog.Error($"NOT Error! Just Showing DALi Version: ({ver1}.{ver2}.{ver3}), NUI API Version: ({nuiAPIVer})");
         }
     }
 }