From 41c375dff1822511a5f23c34bc12fe2a4040aa7b Mon Sep 17 00:00:00 2001
From: AtomCrafty <atomcrafty@frucost.net>
Date: Thu, 10 Nov 2022 07:20:37 +0100
Subject: [PATCH 1/3] fix DevTools style list not updating correctly

---
 .../Diagnostics/ViewModels/ControlDetailsViewModel.cs    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 631da80d8b..71da543d70 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
@@ -15,7 +14,7 @@ using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
-    internal class ControlDetailsViewModel : ViewModelBase, IDisposable
+    internal class ControlDetailsViewModel : ViewModelBase, IDisposable, IClassesChangedListener
     {
         private readonly IAvaloniaObject _avaloniaObject;
         private IDictionary<object, PropertyViewModel[]>? _propertyIndex;
@@ -46,7 +45,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
             if (avaloniaObject is StyledElement styledElement)
             {
-                styledElement.Classes.CollectionChanged += OnClassesChanged;
+                styledElement.Classes.AddListener(this);
 
                 var pseudoClassAttributes = styledElement.GetType().GetCustomAttributes<PseudoClassesAttribute>(true);
 
@@ -250,7 +249,7 @@ namespace Avalonia.Diagnostics.ViewModels
 
             if (_avaloniaObject is StyledElement se)
             {
-                se.Classes.CollectionChanged -= OnClassesChanged;
+                se.Classes.RemoveListener(this);
             }
         }
 
@@ -325,7 +324,7 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        private void OnClassesChanged(object? sender, NotifyCollectionChangedEventArgs e)
+        void IClassesChangedListener.Changed()
         {
             if (!SnapshotStyles)
             {

From 7e6f5403aa2fe0d8a8ff641dbff3f21f3f0d4233 Mon Sep 17 00:00:00 2001
From: AtomCrafty <atomcrafty@frucost.net>
Date: Thu, 10 Nov 2022 06:37:23 +0100
Subject: [PATCH 2/3] fix typos

---
 .../Diagnostics/{Convetions.cs => Conventions.cs}    |  5 +----
 .../Diagnostics/DevToolsOptions.cs                   |  4 ++--
 .../Diagnostics/Screenshots/FilePickerHandler.cs     |  2 +-
 .../Diagnostics/ViewModels/MainViewModel.cs          | 12 +++++++-----
 .../Diagnostics/Views/ControlDetailsView.xaml        | 10 +++++-----
 .../Diagnostics/Views/MainView.xaml                  |  4 ++--
 6 files changed, 18 insertions(+), 19 deletions(-)
 rename src/Avalonia.Diagnostics/Diagnostics/{Convetions.cs => Conventions.cs} (80%)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Convetions.cs b/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs
similarity index 80%
rename from src/Avalonia.Diagnostics/Diagnostics/Convetions.cs
rename to src/Avalonia.Diagnostics/Diagnostics/Conventions.cs
index b41755f239..9091b83ba2 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Convetions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Conventions.cs
@@ -1,11 +1,8 @@
 using System;
-using System.Reflection;
-using Avalonia.Controls;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics
 {
-    static class Convetions
+    internal static class Conventions
     {
         public static string DefaultScreenshotsRoot =>
              System.IO.Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.MyPictures, Environment.SpecialFolderOption.Create),
diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index 5672641602..0558284142 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -36,11 +36,11 @@ namespace Avalonia.Diagnostics
         public bool ShowImplementedInterfaces { get; set; } = true;
         
         /// <summary>
-        /// Allow to customizze SreenshotHandler
+        /// Allow to customize SreenshotHandler
         /// </summary>
         /// <remarks>Default handler is <see cref="Screenshots.FilePickerHandler"/></remarks>
         public IScreenshotHandler ScreenshotHandler { get; set; }
-          = Convetions.DefaultScreenshotHandler;
+          = Conventions.DefaultScreenshotHandler;
 
         /// <summary>
         /// Gets or sets whether DevTools should use the dark mode theme
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
index 4153d2d38c..cfd7f9acf1 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
@@ -40,7 +40,7 @@ namespace Avalonia.Diagnostics.Screenshots
         /// The default root folder is [Environment.SpecialFolder.MyPictures]/Screenshots.
         /// </summary>
         public string ScreenshotsRoot { get; }
-            = Convetions.DefaultScreenshotsRoot;
+            = Conventions.DefaultScreenshotsRoot;
 
         /// <summary>
         /// SaveFilePicker Title
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index 9e8a5d8d9b..1cdebaae01 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -96,7 +96,9 @@ namespace Avalonia.Diagnostics.ViewModels
                     changed = false;
                 }
                 if (changed)
-                RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);
+                {
+                    RaiseAndSetIfChanged(ref _shouldVisualizeDirtyRects, value);
+                }
             }
         }
 
@@ -331,7 +333,7 @@ namespace Avalonia.Diagnostics.ViewModels
             private set => RaiseAndSetIfChanged(ref _showImplementedInterfaces , value); 
         }
 
-        public void ToggleShowImplementedInterfaces(object parametr)
+        public void ToggleShowImplementedInterfaces(object parameter)
         {
             ShowImplementedInterfaces = !ShowImplementedInterfaces;
             if (Content is TreePageViewModel viewModel)
@@ -340,15 +342,15 @@ namespace Avalonia.Diagnostics.ViewModels
             }
         }
 
-        public bool ShowDettailsPropertyType 
+        public bool ShowDetailsPropertyType
         { 
             get => _showPropertyType; 
             private set => RaiseAndSetIfChanged(ref  _showPropertyType , value); 
         }
 
-        public void ToggleShowDettailsPropertyType(object paramter)
+        public void ToggleShowDetailsPropertyType(object parameter)
         {
-            ShowDettailsPropertyType = !ShowDettailsPropertyType;
+            ShowDetailsPropertyType = !ShowDetailsPropertyType;
         }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index a426b387f7..bf595d82a3 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -19,7 +19,7 @@
       <ColumnDefinition Width="Auto"/>
       <!--
       When selecting the Application node, we need this trick to hide Layout Visualizer 
-      because when using the GridSplitter it sets the Witdth property of ColumnDefinition
+      because when using the GridSplitter it sets the Width property of ColumnDefinition
       (see https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Controls/GridSplitter.cs#L528) 
       and if we hide the contents of the column, the space is not reclaimed 
       (see discussion https://github.com/AvaloniaUI/Avalonia/discussions/6773). 
@@ -62,15 +62,15 @@
           <DataGridTextColumn Header="Value" Binding="{Binding Value}" />
           <DataGridTextColumn Header="Type" Binding="{Binding Type}"
                               IsReadOnly="True"
-                              IsVisible="{Binding !$parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              IsVisible="{Binding !$parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
                               />
-          <DataGridTextColumn Header="Assinged Type" Binding="{Binding AssignedType, Converter={StaticResource GetTypeName}}"
+          <DataGridTextColumn Header="Assigned Type" Binding="{Binding AssignedType, Converter={StaticResource GetTypeName}}"
                               IsReadOnly="True"
-                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
                               />
           <DataGridTextColumn Header="Property Type" Binding="{Binding PropertyType, Converter={StaticResource GetTypeName}}"
                               IsReadOnly="True"
-                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDetailsPropertyType}"
                               />
           <DataGridTextColumn Header="Priority" Binding="{Binding Priority}" IsReadOnly="True" />
         </DataGrid.Columns>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
index 35c9e27f1a..a6da929da3 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
@@ -53,10 +53,10 @@
                         IsEnabled="False" />
             </MenuItem.Icon>
           </MenuItem>
-          <MenuItem Header="Split Property Type" Command="{Binding ToggleShowDettailsPropertyType}">
+          <MenuItem Header="Split Property Type" Command="{Binding ToggleShowDetailsPropertyType}">
             <MenuItem.Icon>
               <CheckBox BorderThickness="0"
-                        IsChecked="{Binding ShowDettailsPropertyType}"
+                        IsChecked="{Binding ShowDetailsPropertyType}"
                         IsEnabled="False"/>
             </MenuItem.Icon>
 

From fd3388fe901e2a63b9cdf505ae6d4fcbe0283a44 Mon Sep 17 00:00:00 2001
From: AtomCrafty <atomcrafty@frucost.net>
Date: Thu, 10 Nov 2022 12:20:33 +0100
Subject: [PATCH 3/3] remove unused imports

---
 src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs        | 3 +--
 .../Diagnostics/Screenshots/FilePickerHandler.cs               | 3 +--
 .../Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs        | 1 -
 .../Diagnostics/ViewModels/ClrPropertyViewModel.cs             | 1 -
 .../Diagnostics/ViewModels/MainViewModel.cs                    | 2 --
 src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs    | 1 -
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
index 0558284142..5fc274a4e9 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/DevToolsOptions.cs
@@ -1,5 +1,4 @@
-using System;
-using Avalonia.Input;
+using Avalonia.Input;
 
 namespace Avalonia.Diagnostics
 {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
index cfd7f9acf1..a4b56fcea1 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Screenshots/FilePickerHandler.cs
@@ -1,5 +1,4 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using Avalonia.Controls;
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
index 7384daae30..0e412a2fa5 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/AvaloniaPropertyViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using Avalonia.Data;
-using Avalonia.Media;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
index 73fb615b32..895ff41f7b 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ClrPropertyViewModel.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Reflection;
-using Avalonia.Media;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
index 1cdebaae01..a0514cdd76 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/MainViewModel.cs
@@ -1,13 +1,11 @@
 using System;
 using System.ComponentModel;
 using System.Reactive.Linq;
-using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Diagnostics.Models;
 using Avalonia.Input;
 using Avalonia.Metadata;
 using Avalonia.Threading;
-using System.Linq;
 
 namespace Avalonia.Diagnostics.ViewModels
 {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
index 5459810db9..4fc55333d0 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/TreeNode.cs
@@ -6,7 +6,6 @@ using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.LogicalTree;
 using Avalonia.Media;
-using Avalonia.VisualTree;
 
 namespace Avalonia.Diagnostics.ViewModels
 {