Fix focus when switching back to assembly list via keyboard

icsharpcode · Oct 5, 2024 · 5a1ec2c · 5a1ec2c
1 parent d989085
commit 5a1ec2c
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git 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
@@ -20,6 +20,9 @@
 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 @@ protected override void OnPropertyChanged(DependencyPropertyChangedEventArgs e)
 					});
 				}
 			}
+			else if (e.Property == Pane.IsActiveProperty)
+			{
+				if (!true.Equals(e.NewValue))
+					return;
+
+				if (SelectedItem is SharpTreeNode selectedItem)
+				{
+					FocusNode(selectedItem);
+				}
+				else
+				{
+					Focus();
+				}
+			}
 		}
 	}
 }