From: dongsug-song <35130733+dongsug-song@users.noreply.github.com> Date: Thu, 14 Nov 2019 23:58:38 +0000 (+0900) Subject: [NUI] Fix the crash when setting MinimumSize, MaximumSize (#1124) X-Git-Tag: accepted/tizen/unified/20210219.040944~951 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72daf6a7019a304c38fc9a650e04f3df28bbdb5d;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git [NUI] Fix the crash when setting MinimumSize, MaximumSize (#1124) --- diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs index 80fa7c2..303eca7 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs @@ -1241,13 +1241,17 @@ namespace Tizen.NUI.BaseComponents /// MinimumSizeProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty MinimumSizeProperty = BindableProperty.Create("MinimumSize", typeof(Size), typeof(View), null, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty MinimumSizeProperty = BindableProperty.Create("MinimumSize", typeof(Size2D), typeof(View), null, propertyChanged: (bindable, oldValue, newValue) => { var view = (View)bindable; - Size temp = (Size)newValue; + Size2D temp = newValue as Size2D; if (temp != null) { - Tizen.NUI.Object.SetProperty(view.swigCPtr, View.Property.MINIMUM_SIZE, new Tizen.NUI.PropertyValue(new Vector2(temp.Width, temp.Height))); + Tizen.NUI.Object.SetProperty(view.swigCPtr, View.Property.MINIMUM_SIZE, new Tizen.NUI.PropertyValue(temp)); + } + else + { + Tizen.Log.Fatal("NUI", $"[ERROR] can't set MinimumSizeProperty!"); } }, defaultValueCreator: (bindable) => @@ -1262,13 +1266,17 @@ namespace Tizen.NUI.BaseComponents /// MaximumSizeProperty /// [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty MaximumSizeProperty = BindableProperty.Create("MaximumSize", typeof(Size), typeof(View), null, propertyChanged: (bindable, oldValue, newValue) => + public static readonly BindableProperty MaximumSizeProperty = BindableProperty.Create("MaximumSize", typeof(Size2D), typeof(View), null, propertyChanged: (bindable, oldValue, newValue) => { var view = (View)bindable; - Size temp = (Size)newValue; + Size2D temp = newValue as Size2D; if (temp != null) { - Tizen.NUI.Object.SetProperty(view.swigCPtr, View.Property.MAXIMUM_SIZE, new Tizen.NUI.PropertyValue(new Vector2(temp.Width, temp.Height))); + Tizen.NUI.Object.SetProperty(view.swigCPtr, View.Property.MAXIMUM_SIZE, new Tizen.NUI.PropertyValue(temp)); + } + else + { + Tizen.Log.Fatal("NUI", $"[ERROR] can't set MaximumSizeProperty!"); } }, defaultValueCreator: (bindable) => diff --git a/src/Tizen.NUI/src/public/Extents.cs b/src/Tizen.NUI/src/public/Extents.cs index 27b77fe..7998ec4 100755 --- a/src/Tizen.NUI/src/public/Extents.cs +++ b/src/Tizen.NUI/src/public/Extents.cs @@ -106,7 +106,6 @@ namespace Tizen.NUI /// /// Constructor /// - /// /// /// ///