[NUI] Fix svace issues
authorJiyun Yang <ji.yang@samsung.com>
Fri, 6 Aug 2021 02:29:16 +0000 (11:29 +0900)
committerdongsug-song <35130733+dongsug-song@users.noreply.github.com>
Fri, 6 Aug 2021 04:49:25 +0000 (13:49 +0900)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
src/Tizen.NUI.Components/Controls/ButtonGroup.cs
src/Tizen.NUI.Components/Controls/Navigation/AppBar.cs
src/Tizen.NUI.Components/Controls/Picker.cs

index 3c82d9d..8c5bea7 100755 (executable)
@@ -348,7 +348,7 @@ namespace Tizen.NUI.Components
             if (Count == 0) return;
 
             int buttonWidth = (int)root.Size.Width / Count;
-            int buttonHeight = btStyle.Size.Height > itemheight ? (int)btStyle.Size.Height : (int)itemheight;
+            int buttonHeight = (int)Math.Max(btStyle?.Size?.Height ?? 0.0f, itemheight);
             foreach (Button btnTemp in itemGroup)
             {
                 btnTemp.Size = new Size(buttonWidth, buttonHeight);
index 3439a90..28e51b9 100755 (executable)
@@ -539,10 +539,10 @@ namespace Tizen.NUI.Components
                 }
             }
 
-            if (actionButtonStyle == null) actionButtonStyle = (ButtonStyle)appBarStyle.ActionButton.Clone();
+            if (actionButtonStyle == null) actionButtonStyle = (ButtonStyle)appBarStyle.ActionButton?.Clone();
             else actionButtonStyle.MergeDirectly(appBarStyle.ActionButton);
 
-            if (actionViewStyle == null) actionViewStyle = (ViewStyle)appBarStyle.ActionView.Clone();
+            if (actionViewStyle == null) actionViewStyle = (ViewStyle)appBarStyle.ActionView?.Clone();
             else actionViewStyle.MergeDirectly(appBarStyle.ActionView);
             
 
index 57cd547..096f5a1 100755 (executable)
@@ -288,7 +288,7 @@ namespace Tizen.NUI.Components
                     itemTextLabel.MergeDirectly(pickerStyle.ItemTextLabel);
                 }
 
-                itemHeight = (int)pickerStyle.ItemTextLabel.Size.Height;
+                itemHeight = (int)(pickerStyle.ItemTextLabel.Size?.Height ?? 0);
 
                 if (itemList != null)
                     foreach (TextLabel textLabel in itemList)