diff --git a/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml b/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml
new file mode 100644
index 0000000..3b38ce3
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A
+ B
+ C
+
+
+
+
+
diff --git a/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml.cs b/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml.cs
new file mode 100644
index 0000000..fde13b7
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/CustomDemoDialog.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Dialogs;
+
+public partial class CustomDemoDialog : UserControl
+{
+ public CustomDemoDialog()
+ {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs b/demo/Ursa.Demo/Dialogs/CustomDemoDialogViewModel.cs
similarity index 50%
rename from demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
rename to demo/Ursa.Demo/Dialogs/CustomDemoDialogViewModel.cs
index 6615fb4..55fdb55 100644
--- a/demo/Ursa.Demo/Dialogs/DialogWithActionViewModel.cs
+++ b/demo/Ursa.Demo/Dialogs/CustomDemoDialogViewModel.cs
@@ -1,4 +1,5 @@
-using System;
+using System;
+using System.Collections.ObjectModel;
using System.Threading.Tasks;
using System.Windows.Input;
using CommunityToolkit.Mvvm.ComponentModel;
@@ -8,14 +9,30 @@ using Ursa.Controls;
namespace Ursa.Demo.Dialogs;
-public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
+public partial class CustomDemoDialogViewModel : ObservableObject, IDialogContext
{
- [ObservableProperty] private string _title;
- [ObservableProperty] private DateTime _date;
+ [ObservableProperty] private string? _city;
+ [ObservableProperty] private string? _department;
+ [ObservableProperty] private string? _owner;
+ [ObservableProperty] private string? _target;
+
+ public CustomDemoDialogViewModel()
+ {
+ Cities =
+ [
+ "Shanghai", "Beijing", "Hulunbuir", "Shenzhen", "Hangzhou", "Nanjing", "Chengdu", "Wuhan", "Chongqing",
+ "Suzhou", "Tianjin", "Xi'an", "Qingdao", "Dalian"
+ ];
+ OKCommand = new RelayCommand(OK);
+ CancelCommand = new RelayCommand(Cancel);
+ DialogCommand = new AsyncRelayCommand(ShowDialog);
+ }
+
+ public ObservableCollection Cities { get; set; }
public void Close()
{
- RequestClose?.Invoke(this, false);
+ RequestClose?.Invoke(this, null);
}
public event EventHandler? RequestClose;
@@ -25,15 +42,6 @@ public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
public ICommand DialogCommand { get; set; }
- public DialogWithActionViewModel()
- {
- OKCommand = new RelayCommand(OK);
- CancelCommand = new RelayCommand(Cancel);
- DialogCommand = new AsyncRelayCommand(ShowDialog);
- Title = "Please select a date";
- Date = DateTime.Now;
- }
-
private void OK()
{
RequestClose?.Invoke(this, true);
@@ -46,6 +54,6 @@ public partial class DialogWithActionViewModel: ObservableObject, IDialogContext
private async Task ShowDialog()
{
- await OverlayDialog.ShowCustomModal(new DialogWithActionViewModel());
+ await OverlayDialog.ShowCustomModal(new CustomDemoDialogViewModel());
}
}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/DefaultDemoDialog.axaml b/demo/Ursa.Demo/Dialogs/DefaultDemoDialog.axaml
new file mode 100644
index 0000000..e06f136
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/DefaultDemoDialog.axaml
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/demo/Ursa.Demo/Dialogs/DefaultDemoDialog.axaml.cs b/demo/Ursa.Demo/Dialogs/DefaultDemoDialog.axaml.cs
new file mode 100644
index 0000000..33a5279
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/DefaultDemoDialog.axaml.cs
@@ -0,0 +1,13 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace Ursa.Demo.Dialogs;
+
+public partial class DefaultDemoDialog : UserControl
+{
+ public DefaultDemoDialog()
+ {
+ InitializeComponent();
+ }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/DefaultDemoDialogViewModel.cs b/demo/Ursa.Demo/Dialogs/DefaultDemoDialogViewModel.cs
new file mode 100644
index 0000000..19d58f0
--- /dev/null
+++ b/demo/Ursa.Demo/Dialogs/DefaultDemoDialogViewModel.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Collections.ObjectModel;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Irihi.Avalonia.Shared.Contracts;
+
+namespace Ursa.Demo.Dialogs;
+
+public partial class DefaultDemoDialogViewModel: ObservableObject
+{
+ public ObservableCollection Cities { get; set; }
+ [ObservableProperty] private string? _owner;
+ [ObservableProperty] private string? _department;
+ [ObservableProperty] private string? _target;
+ [ObservableProperty] private string? _city;
+
+ public DefaultDemoDialogViewModel()
+ {
+ Cities =
+ [
+ "Shanghai", "Beijing", "Hulunbuir", "Shenzhen", "Hangzhou", "Nanjing", "Chengdu", "Wuhan", "Chongqing",
+ "Suzhou", "Tianjin", "Xi'an", "Qingdao", "Dalian"
+ ];
+ }
+}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
deleted file mode 100644
index 4132581..0000000
--- a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- A
- B
- C
-
-
-
-
diff --git a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs b/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs
deleted file mode 100644
index 08724f8..0000000
--- a/demo/Ursa.Demo/Dialogs/DialogWithAction.axaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ursa.Demo.Dialogs;
-
-public partial class DialogWithAction : UserControl
-{
- public DialogWithAction()
- {
- InitializeComponent();
- }
-}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
deleted file mode 100644
index 8543273..0000000
--- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs b/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs
deleted file mode 100644
index 4110bb6..0000000
--- a/demo/Ursa.Demo/Dialogs/PlainDialog.axaml.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using Avalonia.Controls;
-
-namespace Ursa.Demo.Dialogs;
-
-public partial class PlainDialog : UserControl
-{
- public PlainDialog()
- {
- InitializeComponent();
- }
-}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs b/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
deleted file mode 100644
index b1058c1..0000000
--- a/demo/Ursa.Demo/Dialogs/PlainDialogViewModel.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace Ursa.Demo.Dialogs;
-
-public class PlainDialogViewModel: ObservableObject
-{
- private DateTime? _date;
-
- public DateTime? Date
- {
- get => _date;
- set => SetProperty(ref _date, value);
- }
-
- private string? _text;
- public string? Text
- {
- get => _text;
- set => SetProperty(ref _text, value);
- }
-
- public PlainDialogViewModel()
- {
- Text = "I am PlainDialogViewModel!";
- }
-}
diff --git a/demo/Ursa.Demo/Pages/DialogDemo.axaml b/demo/Ursa.Demo/Pages/DialogDemo.axaml
index 8ff3534..4a42e99 100644
--- a/demo/Ursa.Demo/Pages/DialogDemo.axaml
+++ b/demo/Ursa.Demo/Pages/DialogDemo.axaml
@@ -6,115 +6,159 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:u="https://irihi.tech/ursa"
xmlns:vm="using:Ursa.Demo.ViewModels"
- d:DesignHeight="450"
+ d:DesignHeight="1200"
d:DesignWidth="800"
x:CompileBindings="True"
x:DataType="vm:DialogDemoViewModel"
mc:Ignorable="d">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ u:FormItem.Label="Global/Local OverlayHost"
+ IsChecked="{Binding IsLocal}"
+ OffContent="Global"
+ OnContent="Local" />
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ u:FormItem.Label="Global/Local OverlayHost"
+ IsChecked="{Binding IsLocal}"
+ OffContent="Global"
+ OnContent="Local" />
+
+
@@ -122,8 +166,8 @@
BorderBrush="{DynamicResource SemiGrey1}"
BorderThickness="1"
ClipToBounds="True"
- CornerRadius="20">
-
+ CornerRadius="12">
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
diff --git a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
index 611eba8..eab28cc 100644
--- a/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DialogDemoViewModel.cs
@@ -1,7 +1,10 @@
using System;
using System.Collections.ObjectModel;
+using System.Threading.Channels;
using System.Threading.Tasks;
using System.Windows.Input;
+using Avalonia;
+using Avalonia.Controls;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using Ursa.Controls;
@@ -11,129 +14,203 @@ namespace Ursa.Demo.ViewModels;
public partial class DialogDemoViewModel: ObservableObject
{
- public ICommand ShowDialogCommand { get; set; }
- public ICommand ShowCustomDialogCommand { get; set; }
+ public const string LocalHost = "LocalHost";
+ public DefaultWindowDialogDemoViewModel DefaultWindowDialogDemoViewModel { get; set; } = new();
+ public CustomWindowDialogDemoViewModel CustomWindowDialogDemoViewModel { get; set; } = new();
+ public DefaultOverlayDialogDemoViewModel DefaultOverlayDialogDemoViewModel { get; set; } = new();
+ public CustomOverlayDialogDemoViewModel CustomOverlayDialogDemoViewModel { get; set; } = new();
+}
- [ObservableProperty] private DialogMode _selectedMode;
- [ObservableProperty] private DialogButton _selectedButton;
- [ObservableProperty] private bool _isWindow;
- [ObservableProperty] private bool _isGlobal;
- [ObservableProperty] private bool _isModal;
- [ObservableProperty] private bool _canLightDismiss;
- [ObservableProperty] private DialogResult? _defaultResult;
- [ObservableProperty] private bool _result;
- [ObservableProperty] private DateTime? _date;
- [ObservableProperty] private bool _fullScreen;
+public partial class DefaultWindowDialogDemoViewModel: ObservableObject
+{
+ [ObservableProperty] private WindowStartupLocation _location;
+ [ObservableProperty] private int? _x;
+ [ObservableProperty] private int? _y;
+ [ObservableProperty] private string? _title;
+ [ObservableProperty] private DialogMode _mode;
+ [ObservableProperty] private DialogButton _button;
[ObservableProperty] private bool _showInTaskBar;
-
- public DialogDemoViewModel()
+ [ObservableProperty] private bool? _isCloseButtonVisible;
+
+ public ICommand ShowDialogCommand { get; }
+
+ public DefaultWindowDialogDemoViewModel()
{
ShowDialogCommand = new AsyncRelayCommand(ShowDialog);
- ShowCustomDialogCommand = new AsyncRelayCommand(ShowCustomDialog);
+ Mode = DialogMode.None;
+ Button = DialogButton.OKCancel;
+ Location = WindowStartupLocation.CenterScreen;
+ }
+
+ private async Task ShowDialog()
+ {
+ var options = new DialogOptions()
+ {
+ Title = Title,
+ Mode = Mode,
+ Button = Button,
+ ShowInTaskBar = ShowInTaskBar,
+ IsCloseButtonVisible = IsCloseButtonVisible,
+ StartupLocation = Location,
+ };
+ if (X.HasValue && Y.HasValue)
+ {
+ options.Position = new PixelPoint(X.Value, Y.Value);
+ }
+ await Dialog.ShowModal(new DefaultDemoDialogViewModel(), options: options);
+ }
+}
+
+public partial class CustomWindowDialogDemoViewModel: ObservableObject
+{
+ [ObservableProperty] private WindowStartupLocation _location;
+ [ObservableProperty] private int? _x;
+ [ObservableProperty] private int? _y;
+ [ObservableProperty] private string? _title;
+ [ObservableProperty] private bool _showInTaskBar;
+ [ObservableProperty] private bool? _isCloseButtonVisible;
+ [ObservableProperty] private bool _isModal;
+
+ public ICommand ShowDialogCommand { get; }
+
+ public CustomWindowDialogDemoViewModel()
+ {
+ ShowDialogCommand = new AsyncRelayCommand(ShowDialog);
+ Location = WindowStartupLocation.CenterScreen;
+ IsModal = true;
+ }
+
+ private async Task ShowDialog()
+ {
+ var options = new DialogOptions()
+ {
+ Title = Title,
+ ShowInTaskBar = ShowInTaskBar,
+ IsCloseButtonVisible = IsCloseButtonVisible,
+ StartupLocation = Location,
+ };
+ if (X.HasValue && Y.HasValue)
+ {
+ options.Position = new PixelPoint(X.Value, Y.Value);
+ }
+
+ if (IsModal)
+ {
+ await Dialog.ShowCustomModal(new CustomDemoDialogViewModel(),
+ options: options);
+ }
+ else
+ {
+ Dialog.ShowCustom(new CustomDemoDialogViewModel(),
+ options: options);
+ }
+ }
+}
+
+public partial class DefaultOverlayDialogDemoViewModel : ObservableObject
+{
+ [ObservableProperty] private HorizontalPosition _horizontalAnchor;
+ [ObservableProperty] private VerticalPosition _verticalAnchor;
+ [ObservableProperty] private double? _horizontalOffset;
+ [ObservableProperty] private double? _verticalOffset;
+ [ObservableProperty] private bool _fullScreen;
+ [ObservableProperty] private DialogMode _mode;
+ [ObservableProperty] private DialogButton _button;
+ [ObservableProperty] private string? _title;
+ [ObservableProperty] private bool _canLightDismiss;
+ [ObservableProperty] private bool _canDragMove;
+ [ObservableProperty] private bool? _isCloseButtonVisible;
+ [ObservableProperty] private bool _isModal;
+ [ObservableProperty] private bool _isLocal;
+
+ public ICommand ShowDialogCommand { get; }
+
+ public DefaultOverlayDialogDemoViewModel()
+ {
+ ShowDialogCommand = new AsyncRelayCommand(ShowDialog);
+ HorizontalAnchor = HorizontalPosition.Center;
+ VerticalAnchor = VerticalPosition.Center;
+ CanDragMove = true;
+ IsModal = true;
+ IsCloseButtonVisible = true;
+ Button = DialogButton.OKCancel;
+ }
+
+ private async Task ShowDialog()
+ {
+ var options = new OverlayDialogOptions()
+ {
+ FullScreen = FullScreen,
+ HorizontalAnchor = HorizontalAnchor,
+ VerticalAnchor = VerticalAnchor,
+ HorizontalOffset = HorizontalOffset,
+ VerticalOffset = VerticalOffset,
+ Mode = Mode,
+ Buttons = Button,
+ Title = Title,
+ CanLightDismiss = CanLightDismiss,
+ CanDragMove = CanDragMove,
+ IsCloseButtonVisible = IsCloseButtonVisible,
+ };
+ string? dialogHostId = IsLocal ? DialogDemoViewModel.LocalHost : null;
+ if (IsModal)
+ {
+ await OverlayDialog.ShowModal(new DefaultDemoDialogViewModel(), dialogHostId, options: options);
+ }
+ else
+ {
+ OverlayDialog.Show(new DefaultDemoDialogViewModel(), dialogHostId, options: options);
+ }
+ }
+}
+
+public partial class CustomOverlayDialogDemoViewModel: ObservableObject
+{
+ [ObservableProperty] private HorizontalPosition _horizontalAnchor;
+ [ObservableProperty] private VerticalPosition _verticalAnchor;
+ [ObservableProperty] private double? _horizontalOffset;
+ [ObservableProperty] private double? _verticalOffset;
+ [ObservableProperty] private bool _fullScreen;
+ [ObservableProperty] private string? _title;
+ [ObservableProperty] private bool _canLightDismiss;
+ [ObservableProperty] private bool _canDragMove;
+ [ObservableProperty] private bool? _isCloseButtonVisible;
+ [ObservableProperty] private bool _isModal;
+ [ObservableProperty] private bool _isLocal;
+
+ public ICommand ShowDialogCommand { get; }
+
+ public CustomOverlayDialogDemoViewModel()
+ {
+ ShowDialogCommand = new AsyncRelayCommand(ShowDialog);
+ HorizontalAnchor = HorizontalPosition.Center;
+ VerticalAnchor = VerticalPosition.Center;
+ CanDragMove = true;
IsModal = true;
- IsGlobal = true;
- ShowInTaskBar = false;
}
private async Task ShowDialog()
{
- var vm = new PlainDialogViewModel();
- if (IsWindow)
+ var options = new OverlayDialogOptions()
{
- DefaultResult = await Dialog.ShowModal(
- vm, options: new DialogOptions()
- {
- Title = "Please select a date",
- Mode = SelectedMode,
- Button = SelectedButton,
- ShowInTaskBar = ShowInTaskBar,
- });
- Date = vm.Date;
+ FullScreen = FullScreen,
+ HorizontalAnchor = HorizontalAnchor,
+ VerticalAnchor = VerticalAnchor,
+ HorizontalOffset = HorizontalOffset,
+ VerticalOffset = VerticalOffset,
+ Title = Title,
+ CanLightDismiss = CanLightDismiss,
+ CanDragMove = CanDragMove,
+ IsCloseButtonVisible = IsCloseButtonVisible,
+ };
+ var dialogHostId = IsLocal ? DialogDemoViewModel.LocalHost : null;
+ if (IsModal)
+ {
+ await OverlayDialog.ShowCustomModal(new CustomDemoDialogViewModel(), dialogHostId, options: options);
}
else
{
- if (IsModal)
- {
- DefaultResult = await OverlayDialog.ShowModal(
- vm,
- IsGlobal ? null : "LocalHost",
- new OverlayDialogOptions()
- {
- Title = "Please select a date",
- Mode = SelectedMode,
- Buttons = SelectedButton,
- CanLightDismiss = CanLightDismiss,
- HorizontalAnchor = HorizontalPosition.Right,
- HorizontalOffset = 50,
- VerticalAnchor = VerticalPosition.Top,
- VerticalOffset = 50,
- FullScreen = FullScreen,
- }
- );
- Date = vm.Date;
- }
- else
- {
- OverlayDialog.Show(
- new PlainDialogViewModel(),
- IsGlobal ? null : "LocalHost",
- new OverlayDialogOptions()
- {
- Title = "Please select a date",
- Mode = SelectedMode,
- Buttons = SelectedButton,
- CanLightDismiss = CanLightDismiss,
- FullScreen = FullScreen,
- });
- }
+ OverlayDialog.ShowCustom(new CustomDemoDialogViewModel(), dialogHostId, options: options);
}
-
- }
-
- private async Task ShowCustomDialog()
- {
- var vm = new DialogWithActionViewModel();
- if (IsWindow)
- {
- if (IsModal)
- {
- Result = await Dialog.ShowCustomModal(
- vm,
- options: new DialogOptions
- {
- ShowInTaskBar = ShowInTaskBar
- });
- Date = vm.Date;
- }
- else
- {
- Dialog.ShowCustom(
- vm,
- options: new DialogOptions
- {
- ShowInTaskBar = ShowInTaskBar
- });
- }
- }
- else
- {
- if (IsModal)
- {
- Result = await OverlayDialog.ShowCustomModal(
- vm, IsGlobal ? null : "LocalHost", options: new OverlayDialogOptions()
- {
- CanLightDismiss = CanLightDismiss,
- FullScreen = FullScreen,
- });
- Date = vm.Date;
- }
- else
- {
- OverlayDialog.ShowCustom(new DialogWithActionViewModel(),
- IsGlobal ? null : "LocalHost",
- options: new OverlayDialogOptions{ CanLightDismiss = CanLightDismiss, FullScreen = FullScreen});
- }
- }
-
}
}
\ No newline at end of file
diff --git a/demo/Ursa.Demo/ViewModels/DrawerDemoViewModel.cs b/demo/Ursa.Demo/ViewModels/DrawerDemoViewModel.cs
index b525da4..e025c00 100644
--- a/demo/Ursa.Demo/ViewModels/DrawerDemoViewModel.cs
+++ b/demo/Ursa.Demo/ViewModels/DrawerDemoViewModel.cs
@@ -13,83 +13,61 @@ namespace Ursa.Demo.ViewModels;
public partial class DrawerDemoViewModel : ObservableObject
{
public ICommand ShowDialogCommand { get; set; }
- public ICommand ShowCustomDialogCommand { get; set; }
- [ObservableProperty] private Position _selectedPosition;
- [ObservableProperty] private DialogButton _selectedButton;
- [ObservableProperty] private bool _isGlobal;
+ [ObservableProperty] private Position _position;
+ [ObservableProperty] private DialogButton _buttons;
+
[ObservableProperty] private bool _canLightDismiss;
- [ObservableProperty] private DialogResult? _defaultResult;
- [ObservableProperty] private bool _result;
[ObservableProperty] private bool _isModal;
- [ObservableProperty] private DateTime? _date;
+ [ObservableProperty] private bool? _isCloseButtonVisible;
+ [ObservableProperty] private string? _title;
+
+ [ObservableProperty] private bool _custom;
+ [ObservableProperty] private bool _isLocal;
public DrawerDemoViewModel()
{
ShowDialogCommand = new AsyncRelayCommand(ShowDefaultDialog);
- ShowCustomDialogCommand = new AsyncRelayCommand(ShowCustomDrawer);
- SelectedPosition = Position.Right;
- IsGlobal = true;
+ Position = Position.Right;
IsModal = true;
+ Title = "Add New";
}
private async Task ShowDefaultDialog()
{
- var vm = new PlainDialogViewModel();
- if (IsModal)
+ var options = new DrawerOptions()
{
- DefaultResult = await Drawer.ShowModal(
- vm,
- IsGlobal ? null : "LocalHost",
- new DrawerOptions()
- {
- Title = "Please select a date",
- Position = SelectedPosition,
- Buttons = SelectedButton,
- CanLightDismiss = CanLightDismiss,
- });
- Date = vm.Date;
+ Position = Position,
+ Buttons = Buttons,
+ CanLightDismiss = CanLightDismiss,
+ IsCloseButtonVisible = IsCloseButtonVisible,
+ Title = Title,
+ };
+ var hostId = IsLocal ? "LocalHost" : null;
+ if (Custom)
+ {
+ var vm = new CustomDemoDialogViewModel();
+ if (IsModal)
+ {
+ await Drawer.ShowCustomModal(vm, hostId, options);
+ }
+ else
+ {
+ Drawer.ShowCustom(vm, hostId, options);
+ }
}
else
{
- Drawer.Show(
- vm,
- IsGlobal ? null : "LocalHost",
- new DrawerOptions()
- {
- Title = "Please select a date",
- Position = SelectedPosition,
- Buttons = SelectedButton,
- CanLightDismiss = CanLightDismiss,
- });
- }
- }
-
- private async Task ShowCustomDrawer()
- {
- var vm = new DialogWithActionViewModel();
- if (IsModal)
- {
- Result = await Drawer.ShowCustomModal(
- vm,
- IsGlobal ? null : "LocalHost",
- new DrawerOptions()
- {
- Position = SelectedPosition,
- CanLightDismiss = CanLightDismiss,
- });
- Date = vm.Date;
- }
- else
- {
- Drawer.ShowCustom(
- vm,
- IsGlobal ? null : "LocalHost",
- new DrawerOptions()
- {
- Position = SelectedPosition,
- CanLightDismiss = CanLightDismiss,
- });
+ var vm = new DefaultDemoDialogViewModel();
+ if (IsModal)
+ {
+ await Drawer.ShowModal(vm, hostId, options);
+ }
+ else
+ {
+ Drawer.Show(vm, hostId, options);
+ }
}
+
}
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/CustomDialogControl.cs b/src/Ursa/Controls/Dialog/CustomDialogControl.cs
index d2145c9..7bc4e4e 100644
--- a/src/Ursa/Controls/Dialog/CustomDialogControl.cs
+++ b/src/Ursa/Controls/Dialog/CustomDialogControl.cs
@@ -1,30 +1,27 @@
using Avalonia.Controls.Primitives;
using Irihi.Avalonia.Shared.Contracts;
+using Irihi.Avalonia.Shared.Helpers;
namespace Ursa.Controls;
-public class CustomDialogControl: DialogControlBase
+public class CustomDialogControl : DialogControlBase
{
- internal bool IsCloseButtonVisible { get; set; }
-
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
- if (_closeButton is not null)
+ var closeButtonVisible = IsCloseButtonVisible ??DataContext is IDialogContext;
+ IsHitTestVisibleProperty.SetValue(closeButtonVisible, _closeButton);
+ if (!closeButtonVisible)
{
- _closeButton.IsVisible = IsCloseButtonVisible;
+ OpacityProperty.SetValue(0, _closeButton);
}
}
public override void Close()
{
if (DataContext is IDialogContext context)
- {
context.Close();
- }
else
- {
OnElementClosing(this, null);
- }
}
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
index 5f0c685..64da36b 100644
--- a/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
+++ b/src/Ursa/Controls/Dialog/DefaultDialogControl.cs
@@ -12,20 +12,30 @@ namespace Ursa.Controls;
[TemplatePart(PART_CancelButton, typeof(Button))]
[TemplatePart(PART_YesButton, typeof(Button))]
[TemplatePart(PART_NoButton, typeof(Button))]
-public class DefaultDialogControl: DialogControlBase
+public class DefaultDialogControl : DialogControlBase
{
public const string PART_OKButton = "PART_OKButton";
public const string PART_CancelButton = "PART_CancelButton";
public const string PART_YesButton = "PART_YesButton";
public const string PART_NoButton = "PART_NoButton";
-
- private Button? _okButton;
+
+ public static readonly StyledProperty TitleProperty =
+ AvaloniaProperty.Register(
+ nameof(Title));
+
+ public static readonly StyledProperty ButtonsProperty =
+ AvaloniaProperty.Register(
+ nameof(Buttons));
+
+ public static readonly StyledProperty ModeProperty =
+ AvaloniaProperty.Register(
+ nameof(Mode));
+
private Button? _cancelButton;
- private Button? _yesButton;
private Button? _noButton;
-
- public static readonly StyledProperty TitleProperty = AvaloniaProperty.Register(
- nameof(Title));
+
+ private Button? _okButton;
+ private Button? _yesButton;
public string? Title
{
@@ -33,24 +43,18 @@ public class DefaultDialogControl: DialogControlBase
set => SetValue(TitleProperty, value);
}
- public static readonly StyledProperty ButtonsProperty = AvaloniaProperty.Register(
- nameof(Buttons));
-
public DialogButton Buttons
{
get => GetValue(ButtonsProperty);
set => SetValue(ButtonsProperty, value);
}
- public static readonly StyledProperty ModeProperty = AvaloniaProperty.Register(
- nameof(Mode));
-
public DialogMode Mode
{
get => GetValue(ModeProperty);
set => SetValue(ModeProperty, value);
}
-
+
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
@@ -62,56 +66,51 @@ public class DefaultDialogControl: DialogControlBase
Button.ClickEvent.AddHandler(DefaultButtonsClose, _okButton, _cancelButton, _yesButton, _noButton);
SetButtonVisibility();
}
-
-
+
+
private void SetButtonVisibility()
{
- bool isCloseButtonVisible = DataContext is IDialogContext || Buttons != DialogButton.YesNo;
- Button.IsVisibleProperty.SetValue(isCloseButtonVisible, _closeButton);
+ var closeButtonVisible = IsCloseButtonVisible ?? (DataContext is IDialogContext || Buttons != DialogButton.YesNo );
+ IsHitTestVisibleProperty.SetValue(closeButtonVisible, _closeButton);
+ if (!closeButtonVisible)
+ {
+ OpacityProperty.SetValue(0, _closeButton);
+ }
switch (Buttons)
{
case DialogButton.None:
- Button.IsVisibleProperty.SetValue(false, _okButton, _cancelButton, _yesButton, _noButton);
+ IsVisibleProperty.SetValue(false, _okButton, _cancelButton, _yesButton, _noButton);
break;
case DialogButton.OK:
- Button.IsVisibleProperty.SetValue(true, _okButton);
- Button.IsVisibleProperty.SetValue(false, _cancelButton, _yesButton, _noButton);
+ IsVisibleProperty.SetValue(true, _okButton);
+ IsVisibleProperty.SetValue(false, _cancelButton, _yesButton, _noButton);
break;
case DialogButton.OKCancel:
- Button.IsVisibleProperty.SetValue(true, _okButton, _cancelButton);
- Button.IsVisibleProperty.SetValue(false, _yesButton, _noButton);
+ IsVisibleProperty.SetValue(true, _okButton, _cancelButton);
+ IsVisibleProperty.SetValue(false, _yesButton, _noButton);
break;
case DialogButton.YesNo:
- Button.IsVisibleProperty.SetValue(false, _okButton, _cancelButton);
- Button.IsVisibleProperty.SetValue(true, _yesButton, _noButton);
+ IsVisibleProperty.SetValue(false, _okButton, _cancelButton);
+ IsVisibleProperty.SetValue(true, _yesButton, _noButton);
break;
case DialogButton.YesNoCancel:
- Button.IsVisibleProperty.SetValue(false, _okButton);
- Button.IsVisibleProperty.SetValue(true, _cancelButton, _yesButton, _noButton);
+ IsVisibleProperty.SetValue(false, _okButton);
+ IsVisibleProperty.SetValue(true, _cancelButton, _yesButton, _noButton);
break;
}
}
-
+
private void DefaultButtonsClose(object? sender, RoutedEventArgs args)
{
if (sender is Button button)
{
if (button == _okButton)
- {
OnElementClosing(this, DialogResult.OK);
- }
else if (button == _cancelButton)
- {
OnElementClosing(this, DialogResult.Cancel);
- }
else if (button == _yesButton)
- {
OnElementClosing(this, DialogResult.Yes);
- }
- else if (button == _noButton)
- {
- OnElementClosing(this, DialogResult.No);
- }
+ else if (button == _noButton) OnElementClosing(this, DialogResult.No);
}
}
@@ -123,7 +122,7 @@ public class DefaultDialogControl: DialogControlBase
}
else
{
- DialogResult result = Buttons switch
+ var result = Buttons switch
{
DialogButton.None => DialogResult.None,
DialogButton.OK => DialogResult.OK,
diff --git a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
index 67ed3ff..4568523 100644
--- a/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DefaultDialogWindow.cs
@@ -12,22 +12,27 @@ namespace Ursa.Controls;
[TemplatePart(PART_NoButton, typeof(Button))]
[TemplatePart(PART_OKButton, typeof(Button))]
[TemplatePart(PART_CancelButton, typeof(Button))]
-public class DefaultDialogWindow: DialogWindow
+public class DefaultDialogWindow : DialogWindow
{
- protected override Type StyleKeyOverride { get; } = typeof(DefaultDialogWindow);
-
public const string PART_YesButton = "PART_YesButton";
public const string PART_NoButton = "PART_NoButton";
public const string PART_OKButton = "PART_OKButton";
public const string PART_CancelButton = "PART_CancelButton";
-
- private Button? _yesButton;
+
+ public static readonly StyledProperty ButtonsProperty =
+ AvaloniaProperty.Register(
+ nameof(Buttons));
+
+ public static readonly StyledProperty ModeProperty =
+ AvaloniaProperty.Register(
+ nameof(Mode));
+
+ private Button? _cancelButton;
private Button? _noButton;
private Button? _okButton;
- private Button? _cancelButton;
- public static readonly StyledProperty ButtonsProperty = AvaloniaProperty.Register(
- nameof(Buttons));
+ private Button? _yesButton;
+ protected override Type StyleKeyOverride { get; } = typeof(DefaultDialogWindow);
public DialogButton Buttons
{
@@ -35,15 +40,12 @@ public class DefaultDialogWindow: DialogWindow
set => SetValue(ButtonsProperty, value);
}
- public static readonly StyledProperty ModeProperty = AvaloniaProperty.Register(
- nameof(Mode));
-
public DialogMode Mode
{
get => GetValue(ModeProperty);
set => SetValue(ModeProperty, value);
}
-
+
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
@@ -59,69 +61,49 @@ public class DefaultDialogWindow: DialogWindow
private void OnDefaultClose(object? sender, RoutedEventArgs e)
{
if (Equals(sender, _yesButton))
- {
Close(DialogResult.Yes);
- return;
- }
- if(Equals(sender, _noButton))
- {
+ else if (Equals(sender, _noButton))
Close(DialogResult.No);
- return;
- }
- if(Equals(sender, _okButton))
- {
+ else if (Equals(sender, _okButton))
Close(DialogResult.OK);
- return;
- }
- if(Equals(sender, _cancelButton))
- {
+ else if (Equals(sender, _cancelButton))
Close(DialogResult.Cancel);
- }
}
private void SetButtonVisibility()
{
- bool closeButtonVisible = DataContext is IDialogContext || Buttons != DialogButton.YesNo;
- SetVisibility(_closeButton, closeButtonVisible);
+ // Close button should be hidden instead if invisible to retain layout.
+ IsVisibleProperty.SetValue(true, _closeButton);
+ var closeButtonVisible =
+ IsCloseButtonVisible ?? (DataContext is IDialogContext || Buttons != DialogButton.YesNo);
+ IsHitTestVisibleProperty.SetValue(closeButtonVisible, _closeButton);
+ if (!closeButtonVisible)
+ {
+ OpacityProperty.SetValue(0, _closeButton);
+ }
switch (Buttons)
{
case DialogButton.None:
- SetVisibility(_okButton, false);
- SetVisibility(_cancelButton, false);
- SetVisibility(_yesButton, false);
- SetVisibility(_noButton, false);
+ IsVisibleProperty.SetValue(false, _okButton, _cancelButton, _yesButton, _noButton);
break;
case DialogButton.OK:
- SetVisibility(_okButton, true);
- SetVisibility(_cancelButton, false);
- SetVisibility(_yesButton, false);
- SetVisibility(_noButton, false);
+ IsVisibleProperty.SetValue(true, _okButton);
+ IsVisibleProperty.SetValue(false, _cancelButton, _yesButton, _noButton);
break;
case DialogButton.OKCancel:
- SetVisibility(_okButton, true);
- SetVisibility(_cancelButton, true);
- SetVisibility(_yesButton, false);
- SetVisibility(_noButton, false);
+ IsVisibleProperty.SetValue(true, _okButton, _cancelButton);
+ IsVisibleProperty.SetValue(false, _yesButton, _noButton);
break;
case DialogButton.YesNo:
- SetVisibility(_okButton, false);
- SetVisibility(_cancelButton, false);
- SetVisibility(_yesButton, true);
- SetVisibility(_noButton, true);
+ IsVisibleProperty.SetValue(false, _okButton, _cancelButton);
+ IsVisibleProperty.SetValue(true, _yesButton, _noButton);
break;
case DialogButton.YesNoCancel:
- SetVisibility(_okButton, false);
- SetVisibility(_cancelButton, true);
- SetVisibility(_yesButton, true);
- SetVisibility(_noButton, true);
+ IsVisibleProperty.SetValue(false, _okButton);
+ IsVisibleProperty.SetValue(true, _cancelButton, _yesButton, _noButton);
break;
}
}
-
- private void SetVisibility(Button? button, bool visible)
- {
- if (button is not null) button.IsVisible = visible;
- }
protected override void OnCloseButtonClicked(object? sender, RoutedEventArgs args)
{
@@ -131,7 +113,7 @@ public class DefaultDialogWindow: DialogWindow
}
else
{
- DialogResult result = Buttons switch
+ var result = Buttons switch
{
DialogButton.None => DialogResult.None,
DialogButton.OK => DialogResult.OK,
diff --git a/src/Ursa/Controls/Dialog/Dialog.cs b/src/Ursa/Controls/Dialog/Dialog.cs
index d2d0974..21dfbe3 100644
--- a/src/Ursa/Controls/Dialog/Dialog.cs
+++ b/src/Ursa/Controls/Dialog/Dialog.cs
@@ -240,6 +240,7 @@ public static class Dialog
window.Buttons = options.Button;
window.Mode = options.Mode;
window.ShowInTaskbar = options.ShowInTaskBar;
+ window.IsCloseButtonVisible = options.IsCloseButtonVisible;
if (options.StartupLocation == WindowStartupLocation.Manual)
{
if (options.Position is not null)
diff --git a/src/Ursa/Controls/Dialog/DialogControlBase.cs b/src/Ursa/Controls/Dialog/DialogControlBase.cs
index 1e3e2fd..8bde726 100644
--- a/src/Ursa/Controls/Dialog/DialogControlBase.cs
+++ b/src/Ursa/Controls/Dialog/DialogControlBase.cs
@@ -20,6 +20,22 @@ public abstract class DialogControlBase : OverlayFeedbackElement
public const string PC_Modal = ":modal";
public const string PC_FullScreen = ":full-screen";
+ public static readonly DirectProperty IsFullScreenProperty =
+ AvaloniaProperty.RegisterDirect(
+ nameof(IsFullScreen), o => o.IsFullScreen, (o, v) => o.IsFullScreen = v);
+
+ protected internal Button? _closeButton;
+
+ private bool _isFullScreen;
+ private Panel? _titleArea;
+
+ static DialogControlBase()
+ {
+ CanDragMoveProperty.Changed.AddClassHandler(OnCanDragMoveChanged);
+ CanCloseProperty.Changed.AddClassHandler(OnCanCloseChanged);
+ IsFullScreenProperty.AffectsPseudoClass(PC_FullScreen);
+ }
+
internal HorizontalPosition HorizontalAnchor { get; set; } = HorizontalPosition.Center;
internal VerticalPosition VerticalAnchor { get; set; } = VerticalPosition.Center;
internal HorizontalPosition ActualHorizontalAnchor { get; set; }
@@ -29,11 +45,7 @@ public abstract class DialogControlBase : OverlayFeedbackElement
internal double? HorizontalOffsetRatio { get; set; }
internal double? VerticalOffsetRatio { get; set; }
internal bool CanLightDismiss { get; set; }
-
- private bool _isFullScreen;
-
- public static readonly DirectProperty IsFullScreenProperty = AvaloniaProperty.RegisterDirect(
- nameof(IsFullScreen), o => o.IsFullScreen, (o, v) => o.IsFullScreen = v);
+ internal bool? IsCloseButtonVisible { get; set; }
public bool IsFullScreen
{
@@ -41,113 +53,6 @@ public abstract class DialogControlBase : OverlayFeedbackElement
set => SetAndRaise(IsFullScreenProperty, ref _isFullScreen, value);
}
- protected internal Button? _closeButton;
- private Panel? _titleArea;
-
- #region Layer Management
-
- public static readonly RoutedEvent LayerChangedEvent =
- RoutedEvent.Register(
- nameof(LayerChanged), RoutingStrategies.Bubble);
-
- public event EventHandler LayerChanged
- {
- add => AddHandler(LayerChangedEvent, value);
- remove => RemoveHandler(LayerChangedEvent, value);
- }
-
- public void UpdateLayer(object? o)
- {
- if (o is DialogLayerChangeType t)
- {
- RaiseEvent(new DialogLayerChangeEventArgs(LayerChangedEvent, t));
- }
- }
-
- #endregion
-
- #region DragMove AttachedPropert
-
- public static readonly AttachedProperty CanDragMoveProperty =
- AvaloniaProperty.RegisterAttached("CanDragMove");
-
- public static void SetCanDragMove(InputElement obj, bool value) => obj.SetValue(CanDragMoveProperty, value);
- public static bool GetCanDragMove(InputElement obj) => obj.GetValue(CanDragMoveProperty);
-
- private static void OnCanDragMoveChanged(InputElement arg1, AvaloniaPropertyChangedEventArgs arg2)
- {
- if (arg2.NewValue.Value)
- {
- arg1.AddHandler(PointerPressedEvent, OnPointerPressed, RoutingStrategies.Bubble);
- arg1.AddHandler(PointerMovedEvent, OnPointerMoved, RoutingStrategies.Bubble);
- arg1.AddHandler(PointerReleasedEvent, OnPointerReleased, RoutingStrategies.Bubble);
- }
- else
- {
- arg1.RemoveHandler(PointerPressedEvent, OnPointerPressed);
- arg1.RemoveHandler(PointerMovedEvent, OnPointerMoved);
- arg1.RemoveHandler(PointerReleasedEvent, OnPointerReleased);
- }
-
- void OnPointerPressed(InputElement sender, PointerPressedEventArgs e)
- {
- if (sender.FindLogicalAncestorOfType() is { } dialog)
- {
- e.Source = dialog;
- }
- }
-
- void OnPointerMoved(InputElement sender, PointerEventArgs e)
- {
- if (sender.FindLogicalAncestorOfType() is { } dialog)
- {
- e.Source = dialog;
- }
- }
-
- void OnPointerReleased(InputElement sender, PointerReleasedEventArgs e)
- {
- if (sender.FindLogicalAncestorOfType() is { } dialog)
- {
- e.Source = dialog;
- }
- }
- }
-
- #endregion
-
- #region Close AttachedProperty
-
- public static readonly AttachedProperty CanCloseProperty =
- AvaloniaProperty.RegisterAttached("CanClose");
-
- public static void SetCanClose(InputElement obj, bool value) => obj.SetValue(CanCloseProperty, value);
- public static bool GetCanClose(InputElement obj) => obj.GetValue(CanCloseProperty);
- private static void OnCanCloseChanged(InputElement arg1, AvaloniaPropertyChangedEventArgs arg2)
- {
- if (arg2.NewValue.Value)
- {
- arg1.AddHandler(PointerPressedEvent, OnPointerPressed, RoutingStrategies.Bubble);
- }
- void OnPointerPressed(InputElement sender, PointerPressedEventArgs e)
- {
- if (sender.FindLogicalAncestorOfType() is { } dialog)
- {
- dialog.Close();
- }
- }
- }
- #endregion
-
- static DialogControlBase()
- {
- CanDragMoveProperty.Changed.AddClassHandler(OnCanDragMoveChanged);
- CanCloseProperty.Changed.AddClassHandler(OnCanCloseChanged);
- IsFullScreenProperty.AffectsPseudoClass(PC_FullScreen);
- }
-
-
-
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
@@ -188,10 +93,107 @@ public abstract class DialogControlBase : OverlayFeedbackElement
e.Source = this;
}
- private void OnCloseButtonClick(object? sender, RoutedEventArgs args) => Close();
+ private void OnCloseButtonClick(object? sender, RoutedEventArgs args)
+ {
+ Close();
+ }
internal void SetAsModal(bool modal)
{
PseudoClasses.Set(PC_Modal, modal);
}
+
+ #region Layer Management
+
+ public static readonly RoutedEvent LayerChangedEvent =
+ RoutedEvent.Register(
+ nameof(LayerChanged), RoutingStrategies.Bubble);
+
+ public event EventHandler LayerChanged
+ {
+ add => AddHandler(LayerChangedEvent, value);
+ remove => RemoveHandler(LayerChangedEvent, value);
+ }
+
+ public void UpdateLayer(object? o)
+ {
+ if (o is DialogLayerChangeType t) RaiseEvent(new DialogLayerChangeEventArgs(LayerChangedEvent, t));
+ }
+
+ #endregion
+
+ #region DragMove AttachedPropert
+
+ public static readonly AttachedProperty CanDragMoveProperty =
+ AvaloniaProperty.RegisterAttached("CanDragMove");
+
+ public static void SetCanDragMove(InputElement obj, bool value)
+ {
+ obj.SetValue(CanDragMoveProperty, value);
+ }
+
+ public static bool GetCanDragMove(InputElement obj)
+ {
+ return obj.GetValue(CanDragMoveProperty);
+ }
+
+ private static void OnCanDragMoveChanged(InputElement arg1, AvaloniaPropertyChangedEventArgs arg2)
+ {
+ if (arg2.NewValue.Value)
+ {
+ arg1.AddHandler(PointerPressedEvent, OnPointerPressed, RoutingStrategies.Bubble);
+ arg1.AddHandler(PointerMovedEvent, OnPointerMoved, RoutingStrategies.Bubble);
+ arg1.AddHandler(PointerReleasedEvent, OnPointerReleased, RoutingStrategies.Bubble);
+ }
+ else
+ {
+ arg1.RemoveHandler(PointerPressedEvent, OnPointerPressed);
+ arg1.RemoveHandler(PointerMovedEvent, OnPointerMoved);
+ arg1.RemoveHandler(PointerReleasedEvent, OnPointerReleased);
+ }
+
+ void OnPointerPressed(InputElement sender, PointerPressedEventArgs e)
+ {
+ if (sender.FindLogicalAncestorOfType() is { } dialog) e.Source = dialog;
+ }
+
+ void OnPointerMoved(InputElement sender, PointerEventArgs e)
+ {
+ if (sender.FindLogicalAncestorOfType() is { } dialog) e.Source = dialog;
+ }
+
+ void OnPointerReleased(InputElement sender, PointerReleasedEventArgs e)
+ {
+ if (sender.FindLogicalAncestorOfType() is { } dialog) e.Source = dialog;
+ }
+ }
+
+ #endregion
+
+ #region Close AttachedProperty
+
+ public static readonly AttachedProperty CanCloseProperty =
+ AvaloniaProperty.RegisterAttached("CanClose");
+
+ public static void SetCanClose(InputElement obj, bool value)
+ {
+ obj.SetValue(CanCloseProperty, value);
+ }
+
+ public static bool GetCanClose(InputElement obj)
+ {
+ return obj.GetValue(CanCloseProperty);
+ }
+
+ private static void OnCanCloseChanged(InputElement arg1, AvaloniaPropertyChangedEventArgs arg2)
+ {
+ if (arg2.NewValue.Value) arg1.AddHandler(PointerPressedEvent, OnPointerPressed, RoutingStrategies.Bubble);
+
+ void OnPointerPressed(InputElement sender, PointerPressedEventArgs e)
+ {
+ if (sender.FindLogicalAncestorOfType() is { } dialog) dialog.Close();
+ }
+ }
+
+ #endregion
}
\ No newline at end of file
diff --git a/src/Ursa/Controls/Dialog/DialogWindow.cs b/src/Ursa/Controls/Dialog/DialogWindow.cs
index fabf85b..603496f 100644
--- a/src/Ursa/Controls/Dialog/DialogWindow.cs
+++ b/src/Ursa/Controls/Dialog/DialogWindow.cs
@@ -11,33 +11,29 @@ namespace Ursa.Controls;
[TemplatePart(PART_CloseButton, typeof(Button))]
[TemplatePart(PART_TitleArea, typeof(Panel))]
-public class DialogWindow: Window
+public class DialogWindow : Window
{
public const string PART_CloseButton = "PART_CloseButton";
public const string PART_TitleArea = "PART_TitleArea";
- protected override Type StyleKeyOverride { get; } = typeof(DialogWindow);
protected internal Button? _closeButton;
private Panel? _titleArea;
-
- internal bool IsCloseButtonVisible { get; set; }
static DialogWindow()
{
- DataContextProperty.Changed.AddClassHandler((o, e) => o.OnDataContextChange(e));
+ DataContextProperty.Changed.AddClassHandler((window, e) =>
+ window.OnDataContextChange(e));
}
-
+
+ protected override Type StyleKeyOverride { get; } = typeof(DialogWindow);
+
+ internal bool? IsCloseButtonVisible { get; set; }
+
private void OnDataContextChange(AvaloniaPropertyChangedEventArgs args)
{
- if (args.OldValue.Value is IDialogContext oldContext)
- {
- oldContext.RequestClose-= OnContextRequestClose;
- }
+ if (args.OldValue.Value is IDialogContext oldContext) oldContext.RequestClose -= OnContextRequestClose;
- if (args.NewValue.Value is IDialogContext newContext)
- {
- newContext.RequestClose += OnContextRequestClose;
- }
+ if (args.NewValue.Value is IDialogContext newContext) newContext.RequestClose += OnContextRequestClose;
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
@@ -46,11 +42,10 @@ public class DialogWindow: Window
Button.ClickEvent.RemoveHandler(OnCloseButtonClicked, _closeButton);
_titleArea?.RemoveHandler(PointerPressedEvent, OnTitlePointerPressed);
_closeButton = e.NameScope.Find