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

Merge pull request #493 from irihitech/collection

Browse Source 
Revert collection expression.
This commit is contained in:
Zhang Dian
2024-11-22 13:37:08 +08:00
committed by GitHub
parent cd3d425ef7 8df275cc12
commit 5db7793adc
5 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Ursa/Common/Constants.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Ursa.Common;
internal static class Constants
{
public static readonly char[] SpaceSeparator = [' '];
}

5
src/Ursa/Controls/Dialog/Dialog.cs
View File

@@ -1,6 +1,7 @@
using Avalonia; using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
using Ursa.Common;
namespace Ursa.Controls; namespace Ursa.Controls;
@@ -216,7 +217,7 @@ public static class Dialog
} }
if (!string.IsNullOrWhiteSpace(options.StyleClass)) if (!string.IsNullOrWhiteSpace(options.StyleClass))
{ {
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries); var styles = options.StyleClass!.Split(Constants.SpaceSeparator, StringSplitOptions.RemoveEmptyEntries);
window.Classes.AddRange(styles); window.Classes.AddRange(styles);
} }
} }
@@ -247,7 +248,7 @@ public static class Dialog
} }
if (!string.IsNullOrWhiteSpace(options.StyleClass)) if (!string.IsNullOrWhiteSpace(options.StyleClass))
{ {
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries); var styles = options.StyleClass!.Split(Constants.SpaceSeparator, StringSplitOptions.RemoveEmptyEntries);
window.Classes.AddRange(styles); window.Classes.AddRange(styles);
} }
} }

5
src/Ursa/Controls/Dialog/OverlayDialog.cs
View File

@@ -2,6 +2,7 @@
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Avalonia.Layout; using Avalonia.Layout;
using Ursa.Common;
namespace Ursa.Controls; namespace Ursa.Controls;
@@ -207,7 +208,7 @@ public static class OverlayDialog
control.CanResize = options.CanResize; control.CanResize = options.CanResize;
if (!string.IsNullOrWhiteSpace(options.StyleClass)) if (!string.IsNullOrWhiteSpace(options.StyleClass))
{ {
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries); var styles = options.StyleClass!.Split(Constants.SpaceSeparator, StringSplitOptions.RemoveEmptyEntries);
control.Classes.AddRange(styles); control.Classes.AddRange(styles);
} }
DialogControlBase.SetCanDragMove(control, options.CanDragMove); DialogControlBase.SetCanDragMove(control, options.CanDragMove);
@@ -238,7 +239,7 @@ public static class OverlayDialog
control.CanResize = options.CanResize; control.CanResize = options.CanResize;
if (!string.IsNullOrWhiteSpace(options.StyleClass)) if (!string.IsNullOrWhiteSpace(options.StyleClass))
{ {
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries); var styles = options.StyleClass!.Split(Constants.SpaceSeparator, StringSplitOptions.RemoveEmptyEntries);
control.Classes.AddRange(styles); control.Classes.AddRange(styles);
} }
DialogControlBase.SetCanDragMove(control, options.CanDragMove); DialogControlBase.SetCanDragMove(control, options.CanDragMove);

5
src/Ursa/Controls/Drawer/Drawer.cs
View File

@@ -3,6 +3,7 @@ using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using Ursa.Common; using Ursa.Common;
using Ursa.Controls.Options; using Ursa.Controls.Options;
// ReSharper disable RedundantExplicitArrayCreation
namespace Ursa.Controls; namespace Ursa.Controls;
@@ -220,7 +221,7 @@ public static class Drawer
if (!string.IsNullOrWhiteSpace(options.StyleClass)) if (!string.IsNullOrWhiteSpace(options.StyleClass))
{ {
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries); var styles = options.StyleClass!.Split(Constants.SpaceSeparator, StringSplitOptions.RemoveEmptyEntries);
drawer.Classes.AddRange(styles); drawer.Classes.AddRange(styles);
} }
} }
@@ -247,7 +248,7 @@ public static class Drawer
} }
if (!string.IsNullOrWhiteSpace(options.StyleClass)) if (!string.IsNullOrWhiteSpace(options.StyleClass))
{ {
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries); var styles = options.StyleClass!.Split(Constants.SpaceSeparator, StringSplitOptions.RemoveEmptyEntries);
drawer.Classes.AddRange(styles); drawer.Classes.AddRange(styles);
} }
} }

7
src/Ursa/Controls/MessageBox/MessageBox.cs
View File

@@ -2,6 +2,7 @@ using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Input; using Avalonia.Input;
using Ursa.Common;
namespace Ursa.Controls; namespace Ursa.Controls;
@@ -22,7 +23,7 @@ public static class MessageBox
}; };
if (!string.IsNullOrWhiteSpace(styleClass)) if (!string.IsNullOrWhiteSpace(styleClass))
{ {
var styles = styleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries); var styles = styleClass!.Split(Constants.SpaceSeparator, StringSplitOptions.RemoveEmptyEntries);
messageWindow.Classes.AddRange(styles); messageWindow.Classes.AddRange(styles);
} }
var lifetime = Application.Current?.ApplicationLifetime; var lifetime = Application.Current?.ApplicationLifetime;
@@ -54,7 +55,7 @@ public static class MessageBox
}; };
if (!string.IsNullOrWhiteSpace(styleClass)) if (!string.IsNullOrWhiteSpace(styleClass))
{ {
var styles = styleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries); var styles = styleClass!.Split(Constants.SpaceSeparator, StringSplitOptions.RemoveEmptyEntries);
messageWindow.Classes.AddRange(styles!); messageWindow.Classes.AddRange(styles!);
} }
var result = await messageWindow.ShowDialog<MessageBoxResult>(owner); var result = await messageWindow.ShowDialog<MessageBoxResult>(owner);
@@ -82,7 +83,7 @@ public static class MessageBox
}; };
if (!string.IsNullOrWhiteSpace(styleClass)) if (!string.IsNullOrWhiteSpace(styleClass))
{ {
var styles = styleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries); var styles = styleClass!.Split(Constants.SpaceSeparator, StringSplitOptions.RemoveEmptyEntries);
messageControl.Classes.AddRange(styles!); messageControl.Classes.AddRange(styles!);
} }
host.AddModalDialog(messageControl); host.AddModalDialog(messageControl);