Rebase the newest code

Samsung · Feb 26, 2025 · daa84ab · daa84ab
1 parent 500eb4d
commit daa84ab
Show file tree

Hide file tree

Showing 4 changed files with 178 additions and 81 deletions.
diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs b/src/Tizen.NUI/src/public/BaseComponents/TextUtils.cs
@@ -758,7 +758,10 @@ public Size Size
         {
             set
             {
-                Interop.EmbeddedItemInfo.SizeSet(SwigCPtr, Size.getCPtr(value));
+                var handle = Size.GetHandleRef(value);
+                Interop.EmbeddedItemInfo.SizeSet(SwigCPtr, handle);
+                Size.ReleaseHandleRef(handle);
+
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get
@@ -778,7 +781,10 @@ public Size RotatedSize
         {
             set
             {
-                Interop.EmbeddedItemInfo.RotatedSizeSet(SwigCPtr, Size.getCPtr(value));
+                var handleRef = Size.GetHandleRef(value);
+                Interop.EmbeddedItemInfo.RotatedSizeSet(SwigCPtr, handleRef);
+                Size.ReleaseHandleRef (handleRef);
+
                 if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             get

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -5386,7 +5386,13 @@ private Size GetInternalSize()
             {
                 internalSize = new Size(OnSizeChanged, 0, 0, 0);
             }
-            Object.InternalRetrievingPropertyVector3(SwigCPtr, Property.SIZE, internalSize.SwigCPtr);
+
+            var w = Interop.Actor.InternalGetPropertyFloat(SwigCPtr, Property.SizeWidth);
+            var h = Interop.Actor.InternalGetPropertyFloat(SwigCPtr, Property.SizeHeight);
+            var d = Interop.Actor.InternalGetPropertyFloat(SwigCPtr, Property.SizeDepth);
+
+            internalSize.ResetValue(w, h, d);
+
             return internalSize;
         }
 

diff --git a/src/Tizen.NUI/src/public/Common/PropertyValue.cs b/src/Tizen.NUI/src/public/Common/PropertyValue.cs
@@ -220,9 +220,8 @@ public PropertyValue(PropertyValue value) : this(Interop.PropertyValue.NewProper
         /// Creates a Size property value.
         /// </summary>
         /// <param name="vectorValue">Size values.</param>
-        internal PropertyValue(Size vectorValue) : this(Interop.PropertyValue.NewPropertyValueVector3(Size.getCPtr(vectorValue)), true)
+        internal PropertyValue(Size vectorValue) : this(vectorValue.Width, vectorValue.Height, vectorValue.Depth)
         {
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
         internal PropertyValue(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
         {
@@ -548,7 +547,8 @@ static public PropertyValue CreateFromObject(System.Object obj)
             }
             else if (type.Equals(typeof(Size)))
             {
-                value = Interop.PropertyValue.NewPropertyValueVector3(Size.getCPtr((Size)obj));
+                var size = obj as Size;
+                value = Interop.PropertyValue.NewPropertyValueVector3Componentwise(size.Width, size.Height, size.Depth);
             }
             else if (type.Equals(typeof(Size2D)))
             {
@@ -655,8 +655,14 @@ public bool Get(Position2D vectorValue)
         [EditorBrowsable(EditorBrowsableState.Never)]
         public bool Get(Size vectorValue)
         {
-            bool ret = Interop.PropertyValue.GetVector3(SwigCPtr, Size.getCPtr(vectorValue));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            if (null == vectorValue)
+            {
+                throw new ArgumentNullException(nameof(vectorValue));
+            }
+
+            var ret = GetVector3Component(out var w, out var h, out var d);
+            vectorValue.ResetValue(w, h, d);
+
             return ret;
         }