From 69c44d53c01ae5e113c572ff08a48991c5137ab7 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Mon, 22 Jul 2024 14:55:49 +0200 Subject: [PATCH] increase TabIndex of cancel and ok buttons --- Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs | 5 +++++ Pilz.UI/Dialogs/FlyoutBase.cs | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs index 673be9d..deaa5cd 100644 --- a/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs +++ b/Pilz.UI.Telerik/Dialogs/RadFlyoutBase.cs @@ -60,6 +60,11 @@ public partial class RadFlyoutBase : UserControl InitializeComponent(); ParentChanged += FlyoutDialogBase_ParentChanged; + // Change TabIndex to a very high value + // -> prevent conflicts with controls based on this class + radButton_Cancel.TabIndex = int.MaxValue - 1; + radButton_Cancel.TabIndex = int.MaxValue; + // SVG Symbols radButton_Cancel.SvgImage = CancelSvg; radButton_Confirm.SvgImage = ConfirmSvg; diff --git a/Pilz.UI/Dialogs/FlyoutBase.cs b/Pilz.UI/Dialogs/FlyoutBase.cs index 08eecb6..486eb5d 100644 --- a/Pilz.UI/Dialogs/FlyoutBase.cs +++ b/Pilz.UI/Dialogs/FlyoutBase.cs @@ -43,10 +43,15 @@ public partial class FlyoutBase : UserControl public FlyoutBase() { InitializeComponent(); - ParentChanged += FlyoutBase_ParentChanged; ; + ParentChanged += FlyoutBase_ParentChanged; + + // Change TabIndex to a very high value + // -> prevent conflicts with controls based on this class + button_Cancel.TabIndex = int.MaxValue - 1; + button_Cancel.TabIndex = int.MaxValue; } - private void FlyoutBase_ParentChanged(object sender, System.EventArgs e) + private void FlyoutBase_ParentChanged(object? sender, EventArgs e) { var frm = FindForm(); if (frm != null)