diff --git a/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs b/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs index feb199d..b1058c1 100644 --- a/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs +++ b/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs @@ -22,7 +22,6 @@ public class PlainDialogViewModel: ObservableObject public PlainDialogViewModel() { - Text = - "千古悠悠 有多少冤魂嗟叹 空怅望人寰无限 丛生哀怨 泣血蝇虫笑苍天 孤帆叠影锁白链 残月升骤起烈烈风 尽吹散 尽吹散 尽吹散 滂沱雨无底涧 涉激流登彼岸 奋力拨云间消得雾患 社稷安抚臣子心 长驱鬼魅不休战 看斜阳照大地阡陌 从头转"; + Text = "I am PlainDialogViewModel!"; } -} \ No newline at end of file +} diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml index 7981a93..8ff3534 100644 --- a/demo/Ursa.Demo/Pages/DialogDemo.axaml +++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml @@ -34,6 +34,12 @@ IsVisible="{Binding !#overlay.IsChecked}" OffContent="Regular" OnContent="Modal" /> + + ( - vm); + vm, + options: new DialogOptions + { + ShowInTaskBar = ShowInTaskBar + }); Date = vm.Date; } else { Dialog.ShowCustom( - vm); + vm, + options: new DialogOptions + { + ShowInTaskBar = ShowInTaskBar + }); } } else diff --git a/src/Ursa/Controls/Dialog/Dialog.cs b/src/Ursa/Controls/Dialog/Dialog.cs index aa459d8..d2d0974 100644 --- a/src/Ursa/Controls/Dialog/Dialog.cs +++ b/src/Ursa/Controls/Dialog/Dialog.cs @@ -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); } } @@ -89,6 +88,10 @@ public static class Dialog window.Show(); return Task.FromResult(DialogResult.None); } + else + { + window.Icon = owner.Icon; + } return window.ShowDialog(owner); } @@ -114,6 +117,10 @@ public static class Dialog window.Show(); return Task.FromResult(DialogResult.None); } + else + { + window.Icon = owner.Icon; + } return window.ShowDialog(owner); } @@ -143,6 +150,10 @@ public static class Dialog window.Show(); return Task.FromResult(default(TResult)); } + else + { + window.Icon = owner.Icon; + } return window.ShowDialog(owner); } @@ -170,6 +181,11 @@ public static class Dialog window.Show(); return Task.FromResult(default(TResult)); } + else + { + + window.Icon = owner.Icon; + } return window.ShowDialog(owner); } @@ -197,6 +213,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 +239,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) diff --git a/src/Ursa/Controls/Dialog/Options/DialogOptions.cs b/src/Ursa/Controls/Dialog/Options/DialogOptions.cs index f7c3408..e743077 100644 --- a/src/Ursa/Controls/Dialog/Options/DialogOptions.cs +++ b/src/Ursa/Controls/Dialog/Options/DialogOptions.cs @@ -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; } \ No newline at end of file