From a02e8dc67bd0ddf9d0a41c7ddef376e495c1b6fa Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Mon, 17 Nov 2025 07:05:30 +0100 Subject: [PATCH] minor fixes --- .../Dialogs/AvaloniaFlyoutBase.axaml.cs | 11 ++++++++--- Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml.cs b/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml.cs index 8afe42d..db3b8e9 100644 --- a/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml.cs +++ b/Pilz.UI.AvaloniaUI/Dialogs/AvaloniaFlyoutBase.axaml.cs @@ -165,12 +165,12 @@ public partial class AvaloniaFlyoutBase : UserControl { } - protected void Close() + protected virtual void Close() { OnClose?.Invoke(this, EventArgs.Empty); } - protected void Close(object? result) + protected virtual void Close(object? result) { Result = result; Close(); @@ -181,6 +181,11 @@ public partial class AvaloniaFlyoutBase : UserControl return true; } + protected virtual object? GetResult() + { + return true; + } + protected virtual void SetShowTitlePanel() { StackPanelHeader.IsVisible = !string.IsNullOrWhiteSpace(Title) || TitleIcon != null; @@ -189,7 +194,7 @@ public partial class AvaloniaFlyoutBase : UserControl protected virtual void ButtonOkay_OnClick(object? sender, RoutedEventArgs e) { if (ValidateOK()) - Close(true); + Close(GetResult()); } protected virtual void ButtonCancel_OnClick(object? sender, RoutedEventArgs e) diff --git a/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj b/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj index b3cce53..9871686 100644 --- a/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj +++ b/Pilz.UI.AvaloniaUI/Pilz.UI.AvaloniaUI.csproj @@ -7,7 +7,7 @@ - 1.2.15 + 1.2.16