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

feat: add styleClass as an option to Dialogs.

Browse Source
This commit is contained in:
rabbitism
2024-11-03 01:19:42 +08:00
parent 571e1fec5f
commit ee707cd977
8 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
View File

@@ -163,6 +163,7 @@ public partial class DefaultOverlayDialogDemoViewModel : ObservableObject
CanDragMove = CanDragMove,
IsCloseButtonVisible = IsCloseButtonVisible,
CanResize = CanResize,
StyleClass = "Alert",
};
string? dialogHostId = IsLocal ? DialogDemoViewModel.LocalHost : null;
if (IsModal)

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

@@ -214,6 +214,10 @@ public static class Dialog
else
window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
}
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
window.Classes.Add(options.StyleClass);
}
}
/// <summary>
@@ -240,5 +244,9 @@ public static class Dialog
else
window.WindowStartupLocation = WindowStartupLocation.CenterOwner;
}
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
window.Classes.Add(options.StyleClass);
}
}
}

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; }
}

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

@@ -205,6 +205,10 @@ public static class OverlayDialog
control.IsCloseButtonVisible = options.IsCloseButtonVisible;
control.CanLightDismiss = options.CanLightDismiss;
control.CanResize = options.CanResize;
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
control.Classes.Add(options.StyleClass);
}
DialogControlBase.SetCanDragMove(control, options.CanDragMove);
}
@@ -231,6 +235,10 @@ public static class OverlayDialog
control.CanLightDismiss = options.CanLightDismiss;
control.IsCloseButtonVisible = options.IsCloseButtonVisible;
control.CanResize = options.CanResize;
if (!string.IsNullOrWhiteSpace(options.StyleClass))
{
control.Classes.Add(options.StyleClass);
}
DialogControlBase.SetCanDragMove(control, options.CanDragMove);
}

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

@@ -217,6 +217,11 @@ 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))
{
drawer.Classes.Add(options.StyleClass!);
}
}
private static void ConfigureDefaultDrawer(DefaultDrawerControl drawer, DrawerOptions? options)
@@ -239,5 +244,9 @@ 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))
{
drawer.Classes.Add(options.StyleClass!);
}
}
}

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; }
}

21
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,10 @@ public static class MessageBox
Title = title,
MessageIcon = icon
};
if (!string.IsNullOrWhiteSpace(styleClass))
{
messageWindow.Classes.Add(styleClass!);
}
var lifetime = Application.Current?.ApplicationLifetime;
if (lifetime is not IClassicDesktopStyleApplicationLifetime classLifetime) return MessageBoxResult.None;
var main = classLifetime.MainWindow;
@@ -37,7 +42,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 +51,10 @@ public static class MessageBox
Title = title,
MessageIcon = icon
};
if (!string.IsNullOrWhiteSpace(styleClass))
{
messageWindow.Classes.Add(styleClass!);
}
var result = await messageWindow.ShowDialog<MessageBoxResult>(owner);
return result;
}
@@ -55,7 +65,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 +78,10 @@ public static class MessageBox
MessageIcon = icon,
[KeyboardNavigation.TabNavigationProperty] = KeyboardNavigationMode.Cycle
};
if (!string.IsNullOrWhiteSpace(styleClass))
{
messageControl.Classes.Add(styleClass!);
}
host.AddModalDialog(messageControl);
var result = await messageControl.ShowAsync<MessageBoxResult>();
return result;