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

Merge pull request #465 from irihitech/issue-422

Browse Source 
New Dialog/Drawer/MessageBox option: StyleClass
This commit is contained in:
Dong Bin
2024-11-11 23:46:53 +08:00
committed by GitHub
parent ff103b19a1 cb0e2f4387
commit b066a7d1c7
26 changed files with 486 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -214,6 +214,11 @@ public static class Dialog
else
window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
}
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries);
window.Classes.AddRange(styles);
}
}
/// <summary>
@@ -240,5 +245,10 @@ public static class Dialog
else
window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
}
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries);
window.Classes.AddRange(styles);
}
}
}

1
src/Ursa/Controls/Dialog/Options/DialogOptions.cs
View File

@@ -32,4 +32,5 @@ public class DialogOptions
public bool CanDragMove { get; set; } = true;
public bool CanResize { get; set; }
public string? StyleClass { get; set; }
}

2
src/Ursa/Controls/Dialog/Options/OverlayDialogOptions.cs
View File

@@ -64,4 +64,6 @@ public class OverlayDialogOptions
public int? TopLevelHashCode { get; set; }
public bool CanResize { get; set; }
public string? StyleClass { get; set; }
}

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

@@ -205,6 +205,11 @@ public static class OverlayDialog
control.IsCloseButtonVisible = options.IsCloseButtonVisible;
control.CanLightDismiss = options.CanLightDismiss;
control.CanResize = options.CanResize;
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries);
control.Classes.AddRange(styles);
}
DialogControlBase.SetCanDragMove(control, options.CanDragMove);
}
@@ -231,6 +236,11 @@ public static class OverlayDialog
control.CanLightDismiss = options.CanLightDismiss;
control.IsCloseButtonVisible = options.IsCloseButtonVisible;
control.CanResize = options.CanResize;
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries);
control.Classes.AddRange(styles);
}
DialogControlBase.SetCanDragMove(control, options.CanDragMove);
}

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

@@ -217,6 +217,12 @@ public static class Drawer
if(options.MinHeight is not null) drawer.MinHeight = options.MinHeight.Value;
if(options.MaxHeight is not null) drawer.MaxHeight = options.MaxHeight.Value;
}
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries);
drawer.Classes.AddRange(styles);
}
}
private static void ConfigureDefaultDrawer(DefaultDrawerControl drawer, DrawerOptions? options)
@@ -239,5 +245,10 @@ public static class Drawer
if(options.MinHeight is not null) drawer.MinHeight = options.MinHeight.Value;
if(options.MaxHeight is not null) drawer.MaxHeight = options.MaxHeight.Value;
}
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
var styles = options.StyleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries);
drawer.Classes.AddRange(styles);
}
}
}

2
src/Ursa/Controls/Drawer/Options/DrawerOptions.cs
View File

@@ -22,4 +22,6 @@ public class DrawerOptions
public int? TopLevelHashCode { get; set; }
public bool CanResize { get; set; }
public string? StyleClass { get; set; }
}

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

@@ -11,7 +11,8 @@ public static class MessageBox
string message,
string? title = null,
MessageBoxIcon icon = MessageBoxIcon.None,
MessageBoxButton button = MessageBoxButton.OK)
MessageBoxButton button = MessageBoxButton.OK,
string? styleClass = null)
{
var messageWindow = new MessageBoxWindow(button)
{
@@ -19,6 +20,11 @@ public static class MessageBox
Title = title,
MessageIcon = icon
};
if (!string.IsNullOrWhiteSpace(styleClass))
{
var styles = styleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries);
messageWindow.Classes.AddRange(styles);
}
var lifetime = Application.Current?.ApplicationLifetime;
if (lifetime is not IClassicDesktopStyleApplicationLifetime classLifetime) return MessageBoxResult.None;
var main = classLifetime.MainWindow;
@@ -37,7 +43,8 @@ public static class MessageBox
string message,
string title,
MessageBoxIcon icon = MessageBoxIcon.None,
MessageBoxButton button = MessageBoxButton.OK)
MessageBoxButton button = MessageBoxButton.OK,
string? styleClass = null)
{
var messageWindow = new MessageBoxWindow(button)
{
@@ -45,6 +52,11 @@ public static class MessageBox
Title = title,
MessageIcon = icon
};
if (!string.IsNullOrWhiteSpace(styleClass))
{
var styles = styleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries);
messageWindow.Classes.AddRange(styles!);
}
var result = await messageWindow.ShowDialog<MessageBoxResult>(owner);
return result;
}
@@ -55,7 +67,8 @@ public static class MessageBox
string? hostId = null,
MessageBoxIcon icon = MessageBoxIcon.None,
MessageBoxButton button = MessageBoxButton.OK,
int? toplevelHashCode = null)
int? toplevelHashCode = null,
string? styleClass = null)
{
var host = OverlayDialogManager.GetHost(hostId, toplevelHashCode);
if (host is null) return MessageBoxResult.None;
@@ -67,6 +80,11 @@ public static class MessageBox
MessageIcon = icon,
[KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle
};
if (!string.IsNullOrWhiteSpace(styleClass))
{
var styles = styleClass!.Split([' '], StringSplitOptions.RemoveEmptyEntries);
messageControl.Classes.AddRange(styles!);
}
host.AddModalDialog(messageControl);
var result = await messageControl.ShowAsync<MessageBoxResult>();
return result;

2
src/Ursa/Controls/OverlayShared/OverlayDialogManager.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Concurrent;
using System.Diagnostics;
namespace Ursa.Controls;
@@ -10,6 +11,7 @@ internal static class OverlayDialogManager
public static void RegisterHost(OverlayDialogHost host, string? id, int? hash)
{
Debug.WriteLine("Count: "+Hosts.Count);
Hosts.TryAdd(new HostKey(id, hash), host);
}

3
src/Ursa/Ursa.csproj
View File

@@ -15,7 +15,8 @@
<ItemGroup>
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Irihi.Avalonia.Shared" Version="0.1.9" />
<PackageReference Include="Irihi.Avalonia.Shared" Version="0.2.1" />
<PackageReference Include="Irihi.Avalonia.Shared.Contracts" Version="0.2.1" />
</ItemGroup>
<ItemGroup>