From 820a6ad3f32c93f574871da34b6d5395a9412cb4 Mon Sep 17 00:00:00 2001
From: Meik <meik.drechsler@consulting4it.de>
Date: Mon, 9 Feb 2026 19:48:11 +0100
Subject: [PATCH] fix aktions scroll fokus

---
 .../Ticket/CloseCaseDialogWithTicket.xaml     |  8 ++++---
 .../Ticket/CloseCaseDialogWithTicket.xaml.cs  | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml b/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml
index f453132..7963efa 100644
--- a/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml
+++ b/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml
@@ -87,9 +87,11 @@
         </Style>
     </UserControl.Resources>
 
-    <ScrollViewer Height="570"
-                  Padding="0 0 5 0"
-                  VerticalScrollBarVisibility="Auto">
+    <ScrollViewer x:Name="DialogContentScrollViewer"
+                  Height="570"
+                  Padding="0 0 5 0"
+                  VerticalScrollBarVisibility="Auto"
+                  Focusable="True">
         <StackPanel>
             <Border x:Name="NewOrExistingOrNoneTicketSelectionBorder">
                 <WrapPanel x:Name="NewOrExistingOrNoneTicketWrap"
diff --git a/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml.cs b/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml.cs
index 12477aa..78582dc 100644
--- a/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml.cs
+++ b/FasdDesktopUi/Basics/UserControls/Ticket/CloseCaseDialogWithTicket.xaml.cs
@@ -2719,6 +2719,23 @@ namespace FasdDesktopUi.Basics.UserControls
                 cFocusInvoker.InvokeGotFocus(parentBorder, e);
         }
 
+        private void RestoreDialogFocusAfterTicketActionSelection()
+        {
+            try
+            {
+                if (DialogContentScrollViewer == null)
+                    return;
+
+                Keyboard.ClearFocus();
+                DialogContentScrollViewer.Focus();
+                Keyboard.Focus(DialogContentScrollViewer);
+            }
+            catch (Exception E)
+            {
+                LogException(E);
+            }
+        }
+
         private void DropDownClosed(object sender, EventArgs e)
         {
             if (!(sender is FrameworkElement fe)) return;
@@ -2728,6 +2745,12 @@ namespace FasdDesktopUi.Basics.UserControls
             if (parentBorder != null)
                 cFocusInvoker.InvokeLostFocus(parentBorder, e);
 
+            if (ReferenceEquals(sender, TicketStatusCombobox))
+            {
+                _ = Dispatcher.BeginInvoke(new Action(RestoreDialogFocusAfterTicketActionSelection), System.Windows.Threading.DispatcherPriority.Input);
+                return;
+            }
+
             DynamicStatusAdditionBorder?.Focus();
         }