[NUI] Fix NUI svace issue (#1342)
authorhuiyueun <35286162+huiyueun@users.noreply.github.com>
Wed, 29 Jan 2020 03:56:25 +0000 (12:56 +0900)
committerGitHub <noreply@github.com>
Wed, 29 Jan 2020 03:56:25 +0000 (12:56 +0900)
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
src/Tizen.NUI.Components/Controls/Popup.cs
src/Tizen.NUI/src/public/BaseComponents/Style/Selector.cs

index da56faf..ae5fd3c 100755 (executable)
@@ -34,7 +34,7 @@ namespace Tizen.NUI.Components
         public static readonly BindableProperty ButtonHeightProperty = BindableProperty.Create(nameof(ButtonHeight), typeof(int), typeof(Popup), default(int), propertyChanged: (bindable, oldValue, newValue) =>
         {
             var instance = (Popup)bindable;
-            if (newValue != null)
+            if (newValue != null && instance?.Style?.Buttons?.Size != null )
             {
                 instance.Style.Buttons.Size.Height = (int)newValue;
                 instance.btGroup.Itemheight = (int)newValue;
@@ -414,7 +414,10 @@ namespace Tizen.NUI.Components
             }
             set
             {
-                Style.Title.Size.Height = value;
+                if (Style?.Title?.Size != null)
+                {
+                     Style.Title.Size.Height = value;
+                }
             }
         }
 
@@ -780,7 +783,7 @@ namespace Tizen.NUI.Components
                 titleY = (int)Style.Title.Position.Y;
             }
 
-            if (btGroup.Count != 0)
+            if (btGroup.Count != 0 && Style?.Buttons?.Size != null )
             {
                 buttonH = (int)Style.Buttons.Size.Height;
             }
index bd2096b..590499c 100755 (executable)
@@ -379,7 +379,7 @@ namespace Tizen.NUI.BaseComponents
                 return (T)((T)value).Clone();
             }
 
-            if (type == typeof(Selector<T>) && view != null)
+            if (type == typeof(Selector<T>) && view != null && value != null)
             {
                 Selector<T> selector = (Selector<T>)value;
                 T valueInState = selector.GetValue(view.ControlState);