From 51a1e43608fb38a447867aa1394be0d99238ae60 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Thu, 1 Aug 2024 12:06:41 +0800 Subject: [PATCH] feat: unify option name. --- src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs | 2 ++ src/Ursa/Controls/Dialog/OverlayDialog.cs | 2 +- src/Ursa/Controls/Drawer/Drawer.cs | 2 +- src/Ursa/Controls/Drawer/Options/DrawerOptions.cs | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs b/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs index b48acea..d4a8b5a 100644 --- a/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs +++ b/src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs @@ -43,6 +43,8 @@ public class OverlayDialogOptions /// /// Only works for CustomDialogControl /// + public bool IsCloseButtonVisible { get; set; } = true; + [Obsolete()] public bool ShowCloseButton { get; set; } = true; public bool CanLightDismiss { get; set; } public bool CanDragMove { get; set; } = true; diff --git a/src/Ursa/Controls/Dialog/OverlayDialog.cs b/src/Ursa/Controls/Dialog/OverlayDialog.cs index 1170044..bc27686 100644 --- a/src/Ursa/Controls/Dialog/OverlayDialog.cs +++ b/src/Ursa/Controls/Dialog/OverlayDialog.cs @@ -195,7 +195,7 @@ public static class OverlayDialog control.HorizontalAnchor == HorizontalPosition.Center ? null : options.HorizontalOffset; control.VerticalOffset = options.VerticalAnchor == VerticalPosition.Center ? null : options.VerticalOffset; - control.IsCloseButtonVisible = options.ShowCloseButton; + control.IsCloseButtonVisible = options.IsCloseButtonVisible; control.CanLightDismiss = options.CanLightDismiss; DialogControlBase.SetCanDragMove(control, options.CanDragMove); } diff --git a/src/Ursa/Controls/Drawer/Drawer.cs b/src/Ursa/Controls/Drawer/Drawer.cs index c36a037..942601a 100644 --- a/src/Ursa/Controls/Drawer/Drawer.cs +++ b/src/Ursa/Controls/Drawer/Drawer.cs @@ -196,7 +196,7 @@ public static class Drawer { options ??= DrawerOptions.Default; drawer.Position = options.Position; - drawer.IsCloseButtonVisible = options.ShowCloseButton; + drawer.IsCloseButtonVisible = options.IsCloseButtonVisible; drawer.CanLightDismiss = options.CanLightDismiss; if (options.Position == Position.Left || options.Position == Position.Right) { diff --git a/src/Ursa/Controls/Drawer/Options/DrawerOptions.cs b/src/Ursa/Controls/Drawer/Options/DrawerOptions.cs index 6d1afe2..3e7aea6 100644 --- a/src/Ursa/Controls/Drawer/Options/DrawerOptions.cs +++ b/src/Ursa/Controls/Drawer/Options/DrawerOptions.cs @@ -14,6 +14,7 @@ public class DrawerOptions public double? MaxHeight { get; set; } = null; public DialogButton Buttons { get; set; } = DialogButton.OKCancel; public string? Title { get; set; } + [Obsolete("Use IsCloseButtonVisible")] public bool ShowCloseButton { get; set; } = true; /// /// The hash code of the top level dialog host. This is used to identify the dialog host if there are multiple dialog hosts with the same id. If this is not provided, the dialog will be added to the first dialog host with the same id.