From: Eunki Hong <eunkiki.hong@samsung.com>
Date: Sat, 7 Jun 2025 15:15:47 +0000 (+0900)
Subject: [NUI][API12] Fix crash when we use NUI.Layout if IsUsingXaml = false
X-Git-Tag: submit/tizen_9.0/20250608.020830~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc98f8ea0db10986e009f4316b25383356220832;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

[NUI][API12] Fix crash when we use NUI.Layout if IsUsingXaml = false

Signed-off-by: Eunki Hong <eunkiki.hong@samsung.com>
---

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 422bf00d9..47812ac2a 100755
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -5186,8 +5186,16 @@ namespace Tizen.NUI.BaseComponents
                     else
                     {
                         // Layout not being replaced so restore margin and padding to View.
-                        SetValue(MarginProperty, layout.Margin);
-                        SetValue(PaddingProperty, layout.Padding);
+                        if (NUIApplication.IsUsingXaml)
+                        {
+                            SetValue(MarginProperty, layout.Margin);
+                            SetValue(PaddingProperty, layout.Padding);
+                        }
+                        else
+                        {
+                            SetInternalMarginProperty(this, null, layout.Margin);
+                            SetInternalPaddingProperty(this, null, layout.Padding);
+                        }
                         NotifyPropertyChanged();
                     }
                 }
@@ -5207,7 +5215,15 @@ namespace Tizen.NUI.BaseComponents
                         {
                             // If View already has a margin set then store it in Layout instead.
                             value.Margin = margin;
-                            SetValue(MarginProperty, new Extents(0, 0, 0, 0));
+                            using var temp = new Extents(0, 0, 0, 0);
+                            if (NUIApplication.IsUsingXaml)
+                            {
+                                SetValue(MarginProperty, temp);
+                            }
+                            else
+                            {
+                                SetInternalMarginProperty(this, null, temp);
+                            }
                             setMargin = true;
                         }
 
@@ -5221,7 +5237,15 @@ namespace Tizen.NUI.BaseComponents
                         {
                             // If View already has a padding set then store it in Layout instead.
                             value.Padding = padding;
-                            SetValue(PaddingProperty, new Extents(0, 0, 0, 0));
+                            using var temp = new Extents(0, 0, 0, 0);
+                            if (NUIApplication.IsUsingXaml)
+                            {
+                                SetValue(PaddingProperty, temp);
+                            }
+                            else
+                            {
+                                SetInternalPaddingProperty(this, null, temp);
+                            }
                             setPadding = true;
                         }