From 5a1ec2ca55291d41ef84b9b971e41c4ea46846c0 Mon Sep 17 00:00:00 2001
From: tom-englert <mail@tom-englert.de>
Date: Sat, 5 Oct 2024 20:09:17 +0200
Subject: [PATCH] Fix focus when switching back to assembly list via keyboard

---
 ILSpy/AssemblyTree/AssemblyListPane.xaml    |  4 +++-
 ILSpy/AssemblyTree/AssemblyListPane.xaml.cs | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ILSpy/AssemblyTree/AssemblyListPane.xaml b/ILSpy/AssemblyTree/AssemblyListPane.xaml
index 49ea9a781..e413985d7 100644
--- a/ILSpy/AssemblyTree/AssemblyListPane.xaml
+++ b/ILSpy/AssemblyTree/AssemblyListPane.xaml
@@ -7,6 +7,7 @@
 						xmlns:treeNodes="clr-namespace:ICSharpCode.ILSpy.TreeNodes"
 						xmlns:assemblyTree="clr-namespace:ICSharpCode.ILSpy.AssemblyTree"
 						xmlns:toms="urn:TomsToolbox"
+						xmlns:viewModels="clr-namespace:ICSharpCode.ILSpy.ViewModels"
 						mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"
 						d:DataContext="{d:DesignInstance assemblyTree:AssemblyTreeModel}"
 						AutomationProperties.Name="Assemblies and Classes"
@@ -15,7 +16,8 @@
 						AllowDrop="True"
 						BorderThickness="0" Visibility="Visible"
 						Root="{Binding Root}"
-						toms:MultiSelectorExtensions.SelectionBinding="{Binding SelectedItems, Mode=TwoWay}">
+						toms:MultiSelectorExtensions.SelectionBinding="{Binding SelectedItems, Mode=TwoWay}"
+						viewModels:Pane.IsActive="{Binding IsActive}">
 	<treeView:SharpTreeView.ItemContainerStyle>
 		<Style TargetType="treeView:SharpTreeViewItem">
 			<Setter Property="Template">
diff --git a/ILSpy/AssemblyTree/AssemblyListPane.xaml.cs b/ILSpy/AssemblyTree/AssemblyListPane.xaml.cs
index 1f31ffc75..93e78a75d 100644
--- a/ILSpy/AssemblyTree/AssemblyListPane.xaml.cs
+++ b/ILSpy/AssemblyTree/AssemblyListPane.xaml.cs
@@ -20,6 +20,9 @@ using System.ComponentModel.Composition;
 using System.Windows;
 using System.Windows.Threading;
 
+using ICSharpCode.ILSpy.ViewModels;
+using ICSharpCode.ILSpyX.TreeView;
+
 using TomsToolbox.Wpf.Composition.Mef;
 
 namespace ICSharpCode.ILSpy.AssemblyTree
@@ -59,6 +62,20 @@ namespace ICSharpCode.ILSpy.AssemblyTree
 					});
 				}
 			}
+			else if (e.Property == Pane.IsActiveProperty)
+			{
+				if (!true.Equals(e.NewValue))
+					return;
+
+				if (SelectedItem is SharpTreeNode selectedItem)
+				{
+					FocusNode(selectedItem);
+				}
+				else
+				{
+					Focus();
+				}
+			}
 		}
 	}
 }