Add Icon for dialogwindow

Add ShowInTaskBar for DialogOptions
This commit is contained in:
芬里尔吉崽
2024-06-17 14:01:01 +08:00
parent 8ae57f4a5b
commit 5eff797d5c
4 changed files with 50 additions and 6 deletions

View File

@@ -1,9 +1,6 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Controls.Shapes;
using Avalonia.Media;
using Ursa.Common;
namespace Ursa.Controls;
@@ -34,6 +31,7 @@ public static class Dialog
}
else
{
window.Icon = owner.Icon;
window.Show(owner);
}
}
@@ -60,6 +58,7 @@ public static class Dialog
}
else
{
window.Icon = owner.Icon;
window.Show(owner);
}
}
@@ -84,11 +83,16 @@ public static class Dialog
};
ConfigureDefaultDialogWindow(window, options);
owner ??= GetMainWindow();
window.Icon = owner!.Icon;
if (owner is null)
{
window.Show();
return Task.FromResult(DialogResult.None);
}
else
{
window.Icon = owner.Icon;
}
return window.ShowDialog<DialogResult>(owner);
}
@@ -114,6 +118,10 @@ public static class Dialog
window.Show();
return Task.FromResult(DialogResult.None);
}
else
{
window.Icon = owner.Icon;
}
return window.ShowDialog<DialogResult>(owner);
}
@@ -143,6 +151,10 @@ public static class Dialog
window.Show();
return Task.FromResult(default(TResult));
}
else
{
window.Icon = owner.Icon;
}
return window.ShowDialog<TResult?>(owner);
}
@@ -170,6 +182,11 @@ public static class Dialog
window.Show();
return Task.FromResult(default(TResult));
}
else
{
window.Icon = owner.Icon;
}
return window.ShowDialog<TResult?>(owner);
}
@@ -197,6 +214,7 @@ public static class Dialog
window.WindowStartupLocation = options.StartupLocation;
window.Title = options.Title;
window.IsCloseButtonVisible = options.IsCloseButtonVisible;
window.ShowInTaskbar = options.ShowInTaskBar;
if (options.StartupLocation == WindowStartupLocation.Manual)
{
if (options.Position is not null)
@@ -222,6 +240,7 @@ public static class Dialog
window.Title = options.Title;
window.Buttons = options.Button;
window.Mode = options.Mode;
window.ShowInTaskbar = options.ShowInTaskBar;
if (options.StartupLocation == WindowStartupLocation.Manual)
{
if (options.Position is not null)

View File

@@ -26,4 +26,6 @@ public class DialogOptions
public DialogButton Button { get; set; } = DialogButton.OKCancel;
public bool IsCloseButtonVisible { get; set; } = true;
public bool ShowInTaskBar { get; set; } = true;
}