From 508c362509b44e1c4e7500c9671a99111e5512ec Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 7 Feb 2024 21:25:47 +0800 Subject: [PATCH 1/2] feat: replace IDialogContext by shared library. --- demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs | 1 + src/Ursa/Controls/Dialog/CustomDialogControl.cs | 1 + src/Ursa/Controls/Dialog/DefaultDialogControl.cs | 1 + src/Ursa/Controls/Dialog/DefaultDialogWindow.cs | 1 + src/Ursa/Controls/Dialog/DialogWindow.cs | 1 + src/Ursa/Controls/Dialog/IDialogContext.cs | 7 ------- src/Ursa/Controls/Drawer/CustomDrawerControl.cs | 1 + src/Ursa/Controls/Drawer/DefaultDrawerControl.cs | 1 + src/Ursa/Controls/Drawer/DrawerControlBase.cs | 1 + src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs | 1 + 10 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 src/Ursa/Controls/Dialog/IDialogContext.cs diff --git a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs index 016fbbd..6615fb4 100644 --- a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs +++ b/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs @@ -3,6 +3,7 @@ using System.Threading.Tasks; using System.Windows.Input; using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.Input; +using Irihi.Avalonia.Shared.Contracts; using Ursa.Controls; namespace Ursa.Demo.Dialogs; diff --git a/src/Ursa/Controls/Dialog/CustomDialogControl.cs b/src/Ursa/Controls/Dialog/CustomDialogControl.cs index f3eb75d..9149106 100644 --- a/src/Ursa/Controls/Dialog/CustomDialogControl.cs +++ b/src/Ursa/Controls/Dialog/CustomDialogControl.cs @@ -6,6 +6,7 @@ using Avalonia.Input; using Avalonia.Input.GestureRecognizers; using Avalonia.Interactivity; using Avalonia.Threading; +using Irihi.Avalonia.Shared.Contracts; using Ursa.Common; using Ursa.Controls.OverlayShared; using Ursa.EventArgs; diff --git a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs index ea21f32..ffa8c77 100644 --- a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs +++ b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs @@ -4,6 +4,7 @@ using Avalonia.Controls.Metadata; using Avalonia.Controls.Primitives; using Avalonia.Input; using Avalonia.Interactivity; +using Irihi.Avalonia.Shared.Contracts; using Irihi.Avalonia.Shared.Helpers; using Ursa.Common; using Ursa.EventArgs; diff --git a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs index 543eb1a..46d7bc9 100644 --- a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs +++ b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs @@ -3,6 +3,7 @@ using Avalonia.Controls; using Avalonia.Controls.Metadata; using Avalonia.Controls.Primitives; using Avalonia.Interactivity; +using Irihi.Avalonia.Shared.Contracts; using Irihi.Avalonia.Shared.Helpers; using Ursa.Common; diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs index 5b6ec90..f183263 100644 --- a/src/Ursa/Controls/Dialog/DialogWindow.cs +++ b/src/Ursa/Controls/Dialog/DialogWindow.cs @@ -4,6 +4,7 @@ using Avalonia.Controls.Metadata; using Avalonia.Controls.Primitives; using Avalonia.Input; using Avalonia.Interactivity; +using Irihi.Avalonia.Shared.Contracts; using Irihi.Avalonia.Shared.Helpers; using Ursa.Common; diff --git a/src/Ursa/Controls/Dialog/IDialogContext.cs b/src/Ursa/Controls/Dialog/IDialogContext.cs deleted file mode 100644 index 8adf3d0..0000000 --- a/src/Ursa/Controls/Dialog/IDialogContext.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Ursa.Controls; - -public interface IDialogContext -{ - void Close(); - event EventHandler RequestClose; -} \ No newline at end of file diff --git a/src/Ursa/Controls/Drawer/CustomDrawerControl.cs b/src/Ursa/Controls/Drawer/CustomDrawerControl.cs index dd1d6da..61a55fe 100644 --- a/src/Ursa/Controls/Drawer/CustomDrawerControl.cs +++ b/src/Ursa/Controls/Drawer/CustomDrawerControl.cs @@ -1,4 +1,5 @@ using Avalonia.Controls.Primitives; +using Irihi.Avalonia.Shared.Contracts; namespace Ursa.Controls; diff --git a/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs b/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs index e262802..9a2feb1 100644 --- a/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs +++ b/src/Ursa/Controls/Drawer/DefaultDrawerControl.cs @@ -3,6 +3,7 @@ using Avalonia.Controls; using Avalonia.Controls.Metadata; using Avalonia.Controls.Primitives; using Avalonia.Interactivity; +using Irihi.Avalonia.Shared.Contracts; using Irihi.Avalonia.Shared.Helpers; using Ursa.Common; using Ursa.EventArgs; diff --git a/src/Ursa/Controls/Drawer/DrawerControlBase.cs b/src/Ursa/Controls/Drawer/DrawerControlBase.cs index 37da681..c582189 100644 --- a/src/Ursa/Controls/Drawer/DrawerControlBase.cs +++ b/src/Ursa/Controls/Drawer/DrawerControlBase.cs @@ -4,6 +4,7 @@ using Avalonia.Controls.Metadata; using Avalonia.Controls.Primitives; using Avalonia.Interactivity; using Avalonia.Threading; +using Irihi.Avalonia.Shared.Contracts; using Irihi.Avalonia.Shared.Helpers; using Ursa.Common; using Ursa.Controls.OverlayShared; diff --git a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs index 42303aa..8f87b30 100644 --- a/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs +++ b/src/Ursa/Controls/OverlayShared/OverlayFeedbackElement.cs @@ -2,6 +2,7 @@ using Avalonia; using Avalonia.Controls; using Avalonia.Interactivity; using Avalonia.Threading; +using Irihi.Avalonia.Shared.Contracts; using Ursa.EventArgs; namespace Ursa.Controls.OverlayShared; From 2f251c282c86a30541089c531b83e4edff769109 Mon Sep 17 00:00:00 2001 From: rabbitism Date: Wed, 7 Feb 2024 21:28:41 +0800 Subject: [PATCH 2/2] feat: make NumericUpDownBase inherit IClearControl. --- src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs index f13aa37..198aa64 100644 --- a/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs +++ b/src/Ursa/Controls/NumericUpDown/NumericUpDownBase.cs @@ -9,13 +9,14 @@ using Avalonia.Data; using Avalonia.Data.Converters; using Avalonia.Input; using Avalonia.Interactivity; +using Irihi.Avalonia.Shared.Contracts; namespace Ursa.Controls; [TemplatePart(PART_Spinner, typeof(ButtonSpinner))] [TemplatePart(PART_TextBox, typeof(TextBox))] [TemplatePart(PART_DragPanel, typeof(Panel))] -public abstract class NumericUpDown : TemplatedControl +public abstract class NumericUpDown : TemplatedControl, IClearControl { public const string PART_Spinner = "PART_Spinner"; public const string PART_TextBox = "PART_TextBox";