Merge pull request #3297 from tom-englert/dev/WpfRefactoring

WPF refactoring
icsharpcode · Oct 6, 2024 · 7f46aab · 7f46aab
2 parents f9ae51b + 5a1ec2c
commit 7f46aab
Show file tree

Hide file tree

Showing 18 changed files with 235 additions and 147 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -45,12 +45,12 @@
     <PackageVersion Include="System.Reflection.Metadata" Version="8.0.0" />
     <PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
-    <PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.18.1" />
-    <PackageVersion Include="TomsToolbox.Wpf.Composition.Mef" Version="2.18.1" />
-    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.18.1" />
+    <PackageVersion Include="TomsToolbox.Wpf.Composition" Version="2.20.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Composition.Mef" Version="2.20.0" />
+    <PackageVersion Include="TomsToolbox.Wpf.Styles" Version="2.20.0" />
     <PackageVersion Include="coverlet.collector" Version="6.0.2" />
   </ItemGroup>
   <ItemGroup>
-    <GlobalPackageReference Include="TomsToolbox.Composition.Analyzer" Version="2.18.1" />
+    <GlobalPackageReference Include="TomsToolbox.Composition.Analyzer" Version="2.20.0" />
   </ItemGroup>
 </Project>
diff --git a/ICSharpCode.ILSpyX/AssemblyListManager.cs b/ICSharpCode.ILSpyX/AssemblyListManager.cs
@@ -113,14 +113,16 @@ public bool RenameList(string selectedAssemblyList, string newListName)
 		public void SaveList(AssemblyList list)
 		{
 			this.settingsProvider.Update(
-				delegate (XElement root) {
+				root => {
 					XElement? doc = root.Element("AssemblyLists");
 					if (doc == null)
 					{
 						doc = new XElement("AssemblyLists");
 						root.Add(doc);
 					}
-					XElement? listElement = doc.Elements("List").FirstOrDefault(e => (string?)e.Attribute("name") == list.ListName);
+
+					XElement? listElement = doc.Elements("List")
+						.FirstOrDefault(e => (string?)e.Attribute("name") == list.ListName);
 					if (listElement != null)
 						listElement.ReplaceWith(list.SaveAsXml());
 					else
@@ -163,13 +165,9 @@ public void ClearAll()
 		{
 			AssemblyLists.Clear();
 			this.settingsProvider.Update(
-				delegate (XElement root) {
+				root => {
 					XElement? doc = root.Element("AssemblyLists");
-					if (doc == null)
-					{
-						return;
-					}
-					doc.Remove();
+					doc?.Remove();
 				});
 		}
 

diff --git a/ILSpy/Analyzers/AnalyzerTreeView.xaml b/ILSpy/Analyzers/AnalyzerTreeView.xaml
@@ -12,8 +12,7 @@
 	ShowRoot="False"
 	BorderThickness="0"
 	Root="{Binding Root}"
-	toms:MultiSelectorExtensions.SelectionBinding="{Binding SelectedItems}"
-	SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
+	toms:MultiSelectorExtensions.SelectionBinding="{Binding SelectedItems, Mode=TwoWay}"
 	SelectionChanged="AnalyzerTreeView_OnSelectionChanged">
 
 	<UIElement.InputBindings>

diff --git a/ILSpy/Analyzers/AnalyzerTreeViewModel.cs b/ILSpy/Analyzers/AnalyzerTreeViewModel.cs
@@ -17,8 +17,6 @@
 // DEALINGS IN THE SOFTWARE.
 
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
 using System.Linq;
 using System.Windows;
@@ -38,8 +36,6 @@ namespace ICSharpCode.ILSpy.Analyzers
 	[Export]
 	public class AnalyzerTreeViewModel : ToolPaneModel
 	{
-		private AnalyzerTreeNode selectedItem;
-
 		public const string PaneContentId = "analyzerPane";
 
 		public AnalyzerTreeViewModel()
@@ -52,14 +48,20 @@ public AnalyzerTreeViewModel()
 
 		public AnalyzerRootNode Root { get; } = new();
 
-		public AnalyzerTreeNode SelectedItem {
-			get => selectedItem;
-			set => SetProperty(ref selectedItem, value);
-		}
-
 		public ICommand AnalyzeCommand => new DelegateCommand(AnalyzeSelected);
 
-		public ObservableCollection<AnalyzerTreeNode> SelectedItems { get; } = [];
+		private AnalyzerTreeNode[] selectedItems = [];
+
+		public AnalyzerTreeNode[] SelectedItems {
+			get => selectedItems ?? [];
+			set {
+				if (SelectedItems.SequenceEqual(value))
+					return;
+
+				selectedItems = value;
+				OnPropertyChanged();
+			}
+		}
 
 		private void AnalyzeSelected()
 		{
@@ -87,7 +89,7 @@ void AddOrSelect(AnalyzerTreeNode node)
 			}
 
 			target.IsExpanded = true;
-			this.SelectedItem = target;
+			this.SelectedItems = [target];
 		}
 
 		public void Analyze(IEntity entity)

diff --git a/ILSpy/App.xaml.cs b/ILSpy/App.xaml.cs
@@ -216,9 +216,6 @@ protected override void OnStartup(StartupEventArgs e)
 			}
 
 			MainWindow = new MainWindow();
-			MainWindow.Loaded += (sender, args) => {
-				ExportProvider.GetExportedValue<AssemblyTreeModel>().Initialize();
-			};
 			MainWindow.Show();
 		}
 

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,8 +16,8 @@
 						AllowDrop="True"
 						BorderThickness="0" Visibility="Visible"
 						Root="{Binding Root}"
-						SelectedItem="{Binding SelectedItem, Mode=TwoWay}"
-						toms:MultiSelectorExtensions.SelectionBinding="{Binding SelectedItems}">
+						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();
+				}
+			}
 		}
 	}
 }