From 4de074b0983a8f0e6dc0c1127d0ad2d8713a9627 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Tue, 14 Jan 2025 09:27:27 +0100 Subject: [PATCH] disable cancel dialog result (we handle it ourself already) --- Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs | 3 +++ Pilz.UI/Dialogs/FlyoutBase.cs | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs index 3dcc388..c3ed961 100644 --- a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs +++ b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs @@ -219,7 +219,10 @@ public partial class RadFlyoutBase : UserControl frm.AcceptButton = radButton_Confirm; if (RegisterDialogCancel) + { frm.CancelButton = radButton_Cancel; + radButton_Cancel.DialogResult = DialogResult.None; + } if (AutoSize) { diff --git a/Pilz.UI/Dialogs/FlyoutBase.cs b/Pilz.UI/Dialogs/FlyoutBase.cs index cdb76bb..6f2ef50 100644 --- a/Pilz.UI/Dialogs/FlyoutBase.cs +++ b/Pilz.UI/Dialogs/FlyoutBase.cs @@ -182,8 +182,12 @@ public partial class FlyoutBase : UserControl { if (RegisterDialogAccept) frm.AcceptButton = button_Accept; + if (RegisterDialogCancel) + { frm.CancelButton = button_Cancel; + button_Cancel.DialogResult = DialogResult.None; + } } }