[NUI] Fix svace issue on Popup
authorJiyun Yang <ji.yang@samsung.com>
Wed, 17 Apr 2024 05:05:13 +0000 (14:05 +0900)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Wed, 17 Apr 2024 06:51:57 +0000 (15:51 +0900)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
src/Tizen.NUI.Components/Controls/Popup.cs

index f046782..da2b75d 100755 (executable)
@@ -738,17 +738,21 @@ namespace Tizen.NUI.Components
                     ButtonHeight = (int)ppStyle.Buttons.SizeHeight;
                 }
 
-                buttonStyle = (ButtonStyle)ppStyle.Buttons?.Clone();
-                if (buttonStyle.PositionUsesPivotPoint == null) buttonStyle.PositionUsesPivotPoint = true;
-                if (buttonStyle.ParentOrigin == null) buttonStyle.ParentOrigin = Tizen.NUI.ParentOrigin.BottomLeft;
-                if (buttonStyle.PivotPoint == null) buttonStyle.PivotPoint = Tizen.NUI.PivotPoint.BottomLeft;
-
-                if (btGroup != null)
+                if (ppStyle.Buttons?.Clone() is ButtonStyle newButtonStyle)
                 {
-                    for (int i = 0; i < btGroup.Count; i++)
+                    buttonStyle = newButtonStyle;
+
+                    if (buttonStyle.PositionUsesPivotPoint == null) buttonStyle.PositionUsesPivotPoint = true;
+                    if (buttonStyle.ParentOrigin == null) buttonStyle.ParentOrigin = Tizen.NUI.ParentOrigin.BottomLeft;
+                    if (buttonStyle.PivotPoint == null) buttonStyle.PivotPoint = Tizen.NUI.PivotPoint.BottomLeft;
+
+                    if (btGroup != null)
                     {
-                        var button = GetButton(i);
-                        button.ApplyStyle(buttonStyle);
+                        for (int i = 0; i < btGroup.Count; i++)
+                        {
+                            var button = GetButton(i);
+                            button.ApplyStyle(buttonStyle);
+                        }
                     }
                 }