Add protect code

Samsung · Feb 25, 2025 · cc08e98 · cc08e98
1 parent 015ae0d
commit cc08e98
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 9 deletions.
diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs
@@ -1598,7 +1598,7 @@ internal static object GetInternalSizeProperty(BindableObject bindable)
 
             var w = Interop.Actor.InternalGetPropertyFloat(view.SwigCPtr, Property.SizeWidth);
             var h = Interop.Actor.InternalGetPropertyFloat(view.SwigCPtr, Property.SizeHeight);
-            var d = view.sizeDepth;
+            var d = Interop.Actor.InternalGetPropertyFloat(view.SwigCPtr, Property.SizeDepth);
 
             view.internalSize.ResetValue(w, h, d);
 

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
@@ -542,10 +542,8 @@ internal void SetSize(float width, float height)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        private float sizeDepth = 0.0f;
         internal void SetSize(float width, float height, float depth)
         {
-            sizeDepth = depth;
             Interop.ActorInternal.SetSize(SwigCPtr, width, height, depth);
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/src/Tizen.NUI/src/public/Common/Size.cs b/src/Tizen.NUI/src/public/Common/Size.cs
@@ -311,12 +311,14 @@ public override int GetHashCode()
         /// <since_tizen> 5 </since_tizen>
         public bool EqualTo(Size rhs)
         {
-            if (null != rhs && width == rhs.width && height == rhs.height && depth == rhs.depth)
+            if (null != rhs && NDalic.Equals(width, rhs.width) && NDalic.Equals(height, rhs.height) && NDalic.Equals(depth, rhs.depth))
             {
                 return true;
             }
-
-            return false;
+            else
+            {
+                return false;
+            }
         }
 
         /// <summary>
@@ -328,12 +330,14 @@ public bool EqualTo(Size rhs)
         /// <since_tizen> 5 </since_tizen>
         public bool NotEqualTo(Size rhs)
         {
-            if (null != rhs && width == rhs.width && height == rhs.height && depth == rhs.depth)
+            if (null != rhs && NDalic.Equals(width, rhs.width) && NDalic.Equals(height, rhs.height) && NDalic.Equals(depth, rhs.depth))
             {
                 return false;
             }
-
-            return true;
+            else
+            {
+                return true;
+            }
         }
 
         /// <inheritdoc/>
@@ -397,16 +401,31 @@ protected override void Dispose(bool disposing)
 
         private Size Add(Size rhs)
         {
+            if (null == rhs)
+            {
+                throw new ArgumentNullException(nameof(rhs));
+            }
+
             return new Size(width + rhs.width, height + rhs.height, depth + rhs.depth);
         }
 
         private Size Subtract(Size rhs)
         {
+            if (null == rhs)
+            {
+                throw new ArgumentNullException(nameof(rhs));
+            }
+
             return new Size(width - rhs.width, height - rhs.height, depth - rhs.depth);
         }
 
         private Size Multiply(Size rhs)
         {
+            if (null == rhs)
+            {
+                throw new ArgumentNullException(nameof(rhs));
+            }
+
             return new Size(width * rhs.width, height * rhs.height, depth * rhs.depth);
         }
 
@@ -417,6 +436,11 @@ private Size Multiply(float rhs)
 
         private Size Divide(Size rhs)
         {
+            if (null == rhs)
+            {
+                throw new ArgumentNullException(nameof(rhs));
+            }
+
             return new Size(width / rhs.width, height / rhs.height, depth / rhs.depth);
         }