From 9b8d78e66a4338394a5143bf860520c89e355cdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20Komosi=C5=84ski?= <darek.komosinski@gmail.com>
Date: Wed, 23 Mar 2022 22:54:56 +0100
Subject: [PATCH 1/2] Add support for property navigation from setter directly.

---
 src/Avalonia.Base/StyledPropertyBase.cs       | 10 +---
 .../ViewModels/BindingSetterViewModel.cs      |  5 ++
 .../ViewModels/ControlDetailsViewModel.cs     | 43 +++++++++++------
 .../ViewModels/ResourceSetterViewModel.cs     |  3 ++
 .../Diagnostics/Views/ControlDetailsView.xaml | 48 ++++++++++++-------
 .../Views/ControlDetailsView.xaml.cs          | 24 ++++++++++
 6 files changed, 93 insertions(+), 40 deletions(-)

diff --git a/src/Avalonia.Base/StyledPropertyBase.cs b/src/Avalonia.Base/StyledPropertyBase.cs
index 16ba571a5a..535a826c1e 100644
--- a/src/Avalonia.Base/StyledPropertyBase.cs
+++ b/src/Avalonia.Base/StyledPropertyBase.cs
@@ -159,9 +159,9 @@ namespace Avalonia
         }
 
         /// <inheritdoc/>
-        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> vistor, ref TData data)
+        public override void Accept<TData>(IAvaloniaPropertyVisitor<TData> visitor, ref TData data)
         {
-            vistor.Visit(this, ref data);
+            visitor.Visit(this, ref data);
         }
 
         /// <summary>
@@ -242,11 +242,5 @@ namespace Avalonia
             _ = type ?? throw new ArgumentNullException(nameof(type));
             return GetMetadata(type).DefaultValue;
         }
-
-        [DebuggerHidden]
-        private Func<IAvaloniaObject, TValue, TValue> Cast<THost>(Func<THost, TValue, TValue> validate)
-        {
-            return (o, v) => validate((THost)o, v);
-        }
     }
 }
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
index de3e56e514..16973a96ef 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/BindingSetterViewModel.cs
@@ -14,11 +14,13 @@ namespace Avalonia.Diagnostics.ViewModels
                 case Binding binding:
                     Path = binding.Path;
                     Tint = Brushes.CornflowerBlue;
+                    ValueTypeTooltip = "Reflection Binding";
 
                     break;
                 case CompiledBindingExtension binding:
                     Path = binding.Path.ToString();
                     Tint = Brushes.DarkGreen;
+                    ValueTypeTooltip = "Compiled Binding";
 
                     break;
                 case TemplateBinding binding:
@@ -32,6 +34,7 @@ namespace Avalonia.Diagnostics.ViewModels
                     }
 
                     Tint = Brushes.OrangeRed;
+                    ValueTypeTooltip = "Template Binding";
 
                     break;
                 default:
@@ -40,6 +43,8 @@ namespace Avalonia.Diagnostics.ViewModels
         }
 
         public IBrush Tint { get; }
+        
+        public string ValueTypeTooltip { get; }
 
         public string Path { get; }
 
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
index 701947d2ab..a1fd8ed028 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ControlDetailsViewModel.cs
@@ -155,31 +155,19 @@ namespace Avalonia.Diagnostics.ViewModels
         public object? SelectedEntity
         {
             get => _selectedEntity;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntity, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntity, value);
         }
 
         public string? SelectedEntityName
         {
             get => _selectedEntityName;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntityName, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntityName, value);
         }
         
         public string? SelectedEntityType
         {
             get => _selectedEntityType;
-            set
-            {
-                RaiseAndSetIfChanged(ref _selectedEntityType, value);
-               
-            }
+            set => RaiseAndSetIfChanged(ref _selectedEntityType, value);
         }
         
         public PropertyViewModel? SelectedProperty
@@ -502,6 +490,31 @@ namespace Avalonia.Diagnostics.ViewModels
                 inpc2.PropertyChanged += ControlPropertyChanged;
             }
         }
+        
+        internal void SelectProperty(AvaloniaProperty property)
+        {
+            SelectedProperty = null;
+
+            if (SelectedEntity != _avaloniaObject)
+            {
+                NavigateToProperty(_avaloniaObject, (_avaloniaObject as IControl)?.Name ?? _avaloniaObject.ToString());    
+            }
+            
+            if (PropertiesView is null)
+            {
+                return;
+            }
+
+            foreach (object o in PropertiesView)
+            {
+                if (o is AvaloniaPropertyViewModel propertyVm && propertyVm.Property == property)
+                {
+                    SelectedProperty = propertyVm;
+                    
+                    break;
+                }
+            }
+        }
 
         internal void UpdatePropertiesView(bool showImplementedInterfaces)
         {
diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
index e93dc7361b..5202ac963e 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/ResourceSetterViewModel.cs
@@ -7,11 +7,14 @@ namespace Avalonia.Diagnostics.ViewModels
         public object Key { get; }
 
         public IBrush Tint { get; }
+        
+        public string ValueTypeTooltip { get; }
 
         public ResourceSetterViewModel(AvaloniaProperty property, object resourceKey, object? resourceValue, bool isDynamic) : base(property, resourceValue)
         {
             Key = resourceKey;
             Tint = isDynamic ? Brushes.Orange : Brushes.Brown;
+            ValueTypeTooltip = isDynamic ? "Dynamic Resource" : "Static Resource";
         }
 
         public void CopyResourceKey()
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index ec97b213a9..8280c4fe2f 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -44,7 +44,9 @@
                               UseWholeWordFilter="{Binding UseWholeWordFilter}"
                               UseRegexFilter="{Binding UseRegexFilter}"/>
       
-      <DataGrid Items="{Binding PropertiesView}"
+      <DataGrid 
+                x:Name="DataGrid"
+                Items="{Binding PropertiesView}"
                 Grid.Row="2"
                 BorderThickness="0"
                 RowBackground="Transparent"
@@ -129,6 +131,18 @@
                     </Expander.Header>
 
                     <ItemsControl Margin="20,0,0,0" Grid.Row="1" Items="{Binding Setters}">
+                      
+                      <ItemsControl.Styles>
+                        <Style Selector="TextBlock.property-name">
+                          <Setter Property="FontWeight" Value="SemiBold" />
+                          <Setter Property="Background" Value="Transparent" />
+                        </Style>
+                        
+                        <Style Selector="TextBlock.property-name:pointerover">
+                          <Setter Property="TextDecorations" Value="Underline" />
+                        </Style>
+                      </ItemsControl.Styles>
+                      
                       <ItemsControl.DataTemplates>
 
                         <DataTemplate DataType="IBrush">
@@ -138,6 +152,17 @@
                           </StackPanel>
                         </DataTemplate>
 
+                        <DataTemplate DataType="Color">
+                          <StackPanel Orientation="Horizontal" Spacing="2">
+                            <Border BorderThickness="1" BorderBrush="Black" Width="8" Height="8">
+                              <Border.Background>
+                                <SolidColorBrush Color="{Binding}" />
+                              </Border.Background>
+                            </Border>
+                            <TextBlock Text="{Binding}" />
+                          </StackPanel>
+                        </DataTemplate>
+                        
                         <DataTemplate DataType="vm:BindingSetterViewModel">
                           <Panel Opacity="{Binding IsActive, Converter={StaticResource BoolToOpacity}}" IsVisible="{Binding IsVisible}" HorizontalAlignment="Left">
                             <Panel.ContextMenu>
@@ -147,10 +172,10 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <TextBlock>{</TextBlock>
-                              <Rectangle Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}"/>
+                              <Rectangle Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}" ToolTip.Tip="{Binding ValueTypeTooltip}"/>
                               <TextBlock Text="{Binding Path}" />
                               <TextBlock>}</TextBlock>
                             </StackPanel>
@@ -158,17 +183,6 @@
                           </Panel>
                         </DataTemplate>
 
-                        <DataTemplate DataType="Color">
-                          <StackPanel Orientation="Horizontal" Spacing="2">
-                            <Border BorderThickness="1" BorderBrush="Black" Width="8" Height="8">
-                              <Border.Background>
-                                <SolidColorBrush Color="{Binding}" />
-                              </Border.Background>
-                            </Border>
-                            <TextBlock Text="{Binding}" />
-                          </StackPanel>
-                        </DataTemplate>
-
                         <DataTemplate DataType="vm:ResourceSetterViewModel">
                           <Panel Opacity="{Binding IsActive, Converter={StaticResource BoolToOpacity}}" IsVisible="{Binding IsVisible}" HorizontalAlignment="Left">
                             <Panel.ContextMenu>
@@ -179,11 +193,11 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2" HorizontalAlignment="Left">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                               <TextBlock>(</TextBlock>
-                              <Ellipse Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}"/>
+                              <Ellipse Height="8" Width="8" VerticalAlignment="Center" Fill="{Binding Tint}" ToolTip.Tip="{Binding ValueTypeTooltip}"/>
                               <TextBlock FontStyle="Italic" Text="{Binding Key}" />
                               <TextBlock>)</TextBlock>
                             </StackPanel>
@@ -200,7 +214,7 @@
                               </ContextMenu>
                             </Panel.ContextMenu>
                             <StackPanel Orientation="Horizontal" Spacing="2">
-                              <TextBlock Text="{Binding Name}" FontWeight="SemiBold" />
+                              <TextBlock Classes="property-name" PointerPressed="PropertyNamePressed" Text="{Binding Name}" />
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                             </StackPanel>
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
index 78919a2105..08ffe2c081 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml.cs
@@ -7,9 +7,13 @@ namespace Avalonia.Diagnostics.Views
 {
     internal class ControlDetailsView : UserControl
     {
+        private DataGrid _dataGrid;
+
         public ControlDetailsView()
         {
             InitializeComponent();
+
+            _dataGrid = this.GetControl<DataGrid>("DataGrid");
         }
 
         private void InitializeComponent()
@@ -25,5 +29,25 @@ namespace Avalonia.Diagnostics.Views
             }
             
         }
+
+        private void PropertyNamePressed(object sender, PointerPressedEventArgs e)
+        {
+            var mainVm = (ControlDetailsViewModel?) DataContext;
+
+            if (mainVm is null)
+            {
+                return;
+            }
+            
+            if (sender is Control control && control.DataContext is SetterViewModel setterVm)
+            {
+                mainVm.SelectProperty(setterVm.Property);
+
+                if (mainVm.SelectedProperty is not null)
+                {
+                    _dataGrid.ScrollIntoView(mainVm.SelectedProperty, null);   
+                }
+            }
+        }
     }
 }

From b18cb5cac5b80981847acc75cc53c0914ba2bcbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dariusz=20Komosi=C5=84ski?= <darek.komosinski@gmail.com>
Date: Wed, 23 Mar 2022 23:14:36 +0100
Subject: [PATCH 2/2] Improve hit testing of inactive property names.

---
 .../Diagnostics/Views/ControlDetailsView.xaml      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index 8280c4fe2f..cc392853be 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -141,6 +141,14 @@
                         <Style Selector="TextBlock.property-name:pointerover">
                           <Setter Property="TextDecorations" Value="Underline" />
                         </Style>
+                        
+                        <Style Selector="Rectangle.property-inactive">
+                          <Setter Property="IsHitTestVisible" Value="False" />
+                          <Setter Property="Height" Value="1" />
+                          <Setter Property="Fill" Value="#6C6C6C" />
+                          <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                        
                       </ItemsControl.Styles>
                       
                       <ItemsControl.DataTemplates>
@@ -179,7 +187,7 @@
                               <TextBlock Text="{Binding Path}" />
                               <TextBlock>}</TextBlock>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" VerticalAlignment="Center" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>
 
@@ -201,7 +209,7 @@
                               <TextBlock FontStyle="Italic" Text="{Binding Key}" />
                               <TextBlock>)</TextBlock>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>
 
@@ -218,7 +226,7 @@
                               <TextBlock Text=":" />
                               <ContentControl Content="{Binding Value}"/>
                             </StackPanel>
-                            <Rectangle Height="1" Fill="#6C6C6C" VerticalAlignment="Center" IsVisible="{Binding !IsActive}" />
+                            <Rectangle Classes="property-inactive" IsVisible="{Binding !IsActive}" />
                           </Panel>
                         </DataTemplate>