From 739d9de5b7c70d2d35d28063e19663745919ffb4 Mon Sep 17 00:00:00 2001
From: Giuseppe Lippolis <workgroupengineering@outlook.com>
Date: Wed, 1 Sep 2021 12:32:40 +0200
Subject: [PATCH] feat(DevTools): Shows the property type and the type assigned
 to the property in a single or split column.

---
 .../Diagnostics/ViewModels/PropertyViewModel.cs          | 3 +++
 .../Diagnostics/Views/ControlDetailsView.xaml            | 9 ++++++++-
 src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
index 1de1c34ea0..d3cdff6e71 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/PropertyViewModel.cs
@@ -24,6 +24,9 @@ namespace Avalonia.Diagnostics.ViewModels
         public abstract bool? IsAttached { get; }
         public abstract void Update();
         public abstract string PropertyType { get; }
+        public string Type => PropertyType == AssignedType
+            ? PropertyType
+            : $"{PropertyType} {{{AssignedType}}}";
 
 
         protected static string GetTypeName(Type type)
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
index 5dfc75106a..e6965884b1 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/ControlDetailsView.xaml
@@ -33,7 +33,14 @@
         <DataGrid.Columns>
           <DataGridTextColumn Header="Property" Binding="{Binding Name}" IsReadOnly="True" />
           <DataGridTextColumn Header="Value" Binding="{Binding Value}" />
-          <DataGridTextColumn Header="Assinged Type" Binding="{Binding AssignedType}" IsReadOnly="True"/>
+          <DataGridTextColumn Header="Type" Binding="{Binding Type}"
+                              IsReadOnly="True"
+                              IsVisible="{Binding !$parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              />
+          <DataGridTextColumn Header="Assinged Type" Binding="{Binding AssignedType}"  
+                              IsReadOnly="True"
+                              IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
+                              />
           <DataGridTextColumn Header="Property Type" Binding="{Binding PropertyType}" 
                               IsReadOnly="True"
                               IsVisible="{Binding $parent[UserControl;2].DataContext.ShowDettailsPropertyType}"
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
index d952921442..375c9b303c 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainView.xaml
@@ -16,7 +16,7 @@
           </MenuItem.Icon>
         </MenuItem>
         <MenuItem Header="_Dettails">
-          <MenuItem Header="Show Property Type" Command="{Binding ToggleShowDettailsPropertyType}">
+          <MenuItem Header="Split Property Type" Command="{Binding ToggleShowDettailsPropertyType}">
             <MenuItem.Icon>
               <CheckBox BorderThickness="0"
                         IsChecked="{Binding ShowDettailsPropertyType}"