chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: clean up warnings.

Browse Source
This commit is contained in:
rabbitism
2024-07-30 18:33:30 +08:00
parent e1f91f612b
commit 15fb5a2d1b
167 changed files with 473 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Ursa/Controls/MessageBox/MessageBoxControl.cs
View File

@@ -2,12 +2,8 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Media;
using Avalonia.Styling;
using Irihi.Avalonia.Shared.Helpers;
using Ursa.Common;
namespace Ursa.Controls;
@@ -41,7 +37,7 @@ public class MessageBoxControl: DialogControlBase
}
public static readonly StyledProperty<MessageBoxButton> ButtonsProperty = AvaloniaProperty.Register<MessageBoxControl, MessageBoxButton>(
nameof(Buttons), MessageBoxButton.OK);
nameof(Buttons));
public MessageBoxButton Buttons
{
@@ -60,7 +56,7 @@ public class MessageBoxControl: DialogControlBase
static MessageBoxControl()
{
ButtonsProperty.Changed.AddClassHandler<MessageBoxControl>((o, e) => { o.SetButtonVisibility(); });
ButtonsProperty.Changed.AddClassHandler<MessageBoxControl>((o, _) => { o.SetButtonVisibility(); });
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
@@ -75,7 +71,7 @@ public class MessageBoxControl: DialogControlBase
SetButtonVisibility();
}
private void DefaultButtonsClose(object sender, RoutedEventArgs e)
private void DefaultButtonsClose(object? sender, RoutedEventArgs e)
{
if (sender is Button button)
{

32
src/Ursa/Controls/MessageBox/MessageBoxWindow.cs
View File

@@ -4,9 +4,7 @@ using Avalonia.Controls.Metadata;
using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Platform;
using Irihi.Avalonia.Shared.Helpers;
using Ursa.Common;
namespace Ursa.Controls;
@@ -15,7 +13,7 @@ namespace Ursa.Controls;
[TemplatePart(PART_OKButton, typeof(Button))]
[TemplatePart(PART_CancelButton, typeof(Button))]
[TemplatePart(PART_YesButton, typeof(Button))]
public class MessageBoxWindow : Window
public class MessageBoxWindow(MessageBoxButton buttons) : Window
{
public const string PART_CloseButton = "PART_CloseButton";
public const string PART_YesButton = "PART_YesButton";
@@ -23,8 +21,6 @@ public class MessageBoxWindow : Window
public const string PART_OKButton = "PART_OKButton";
public const string PART_CancelButton = "PART_CancelButton";
private MessageBoxButton _buttonConfigs;
private Button? _closeButton;
private Button? _yesButton;
private Button? _noButton;
@@ -43,14 +39,8 @@ public class MessageBoxWindow : Window
set => SetValue(MessageIconProperty, value);
}
public MessageBoxWindow()
public MessageBoxWindow() : this(MessageBoxButton.OK)
{
_buttonConfigs = MessageBoxButton.OK;
}
public MessageBoxWindow(MessageBoxButton buttons)
{
_buttonConfigs = buttons;
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
@@ -70,7 +60,7 @@ public class MessageBoxWindow : Window
private void SetButtonVisibility()
{
switch (_buttonConfigs)
switch (buttons)
{
case MessageBoxButton.OK:
Button.IsVisibleProperty.SetValue(true, _okButton);
@@ -91,9 +81,9 @@ public class MessageBoxWindow : Window
}
}
private void OnCloseButtonClick(object sender, RoutedEventArgs e)
private void OnCloseButtonClick(object? sender, RoutedEventArgs e)
{
if (_buttonConfigs == MessageBoxButton.OK)
if (buttons == MessageBoxButton.OK)
{
Close(MessageBoxResult.OK);
}
@@ -101,21 +91,21 @@ public class MessageBoxWindow : Window
Close(MessageBoxResult.Cancel);
}
private void OnDefaultButtonClick(object sender, RoutedEventArgs e)
private void OnDefaultButtonClick(object? sender, RoutedEventArgs e)
{
if (sender == _okButton)
if (Equals(sender, _okButton))
{
Close(MessageBoxResult.OK);
}
else if (sender == _cancelButton)
else if (Equals(sender, _cancelButton))
{
Close(MessageBoxResult.Cancel);
}
else if (sender == _yesButton)
else if (Equals(sender, _yesButton))
{
Close(MessageBoxResult.Yes);
}
else if (sender == _noButton)
else if (Equals(sender, _noButton))
{
Close(MessageBoxResult.No);
}
@@ -124,7 +114,7 @@ public class MessageBoxWindow : Window
protected override void OnKeyUp(KeyEventArgs e)
{
base.OnKeyUp(e);
if (e.Key == Key.Escape && _buttonConfigs == MessageBoxButton.OK)
if (e.Key == Key.Escape && buttons == MessageBoxButton.OK)
{
Close(MessageBoxResult.OK);
}