First steps for showing the source of value inheritance

Snoop.Core/Commands/InheritedValueSourceHelper.cs

@@ -10,12 +10,13 @@
 using System.Windows;
 using System.Windows.Media;
 using Snoop.Infrastructure;
+using Snoop.Infrastructure.Helpers;
 
 public class InheritedValueSourceHelper : INotifyPropertyChanged
 {
     public static readonly InheritedValueSourceHelper Instance = new();
 
-    private static readonly PropertyInfo? inheritanceParentPropertyInfo = typeof(DependencyObject).GetProperty("InheritanceParent", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+    //private static readonly PropertyInfo? inheritanceParentPropertyInfo = typeof(DependencyObject).GetProperty("InheritanceParent", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
 
     public event PropertyChangedEventHandler? PropertyChanged;
 
@@ -40,19 +41,21 @@ private void CommandExecute(object? obj)
 
         var sources = GetInheritedValueSources(currentTarget, property);
 
-        MessageBox.Show(string.Join(Environment.NewLine, sources.Select(x => $"{UIObjectNameHelper.GetName(x)}")));
+        MessageBox.Show(string.Join(Environment.NewLine, sources.Select(x => $"{UIObjectNameHelper.GetNameAndType(x)}")));
     }
 
-    private static ObservableCollection<DependencyObject> GetInheritedValueSources(DependencyObject? currentTarget, DependencyProperty property)
+    private static ObservableCollection<DependencyObject> GetInheritedValueSources(DependencyObject? toInspect, DependencyProperty property)
     {
         var sources = new ObservableCollection<DependencyObject>();
+        var currentTarget = toInspect;
 
         if (currentTarget is not null)
         {
             sources.Add(currentTarget);
         }
 
-        while ((currentTarget = inheritanceParentPropertyInfo?.GetValue(currentTarget) as DependencyObject) is not null)
+        //while ((currentTarget = inheritanceParentPropertyInfo?.GetValue(currentTarget) as DependencyObject) is not null)
+        while (currentTarget is not null)
         {
             sources.Add(currentTarget);
 
@@ -60,6 +63,9 @@ private static ObservableCollection<DependencyObject> GetInheritedValueSources(D
             {
                 break;
             }
+
+            currentTarget = LogicalTreeHelper.GetParent(currentTarget)
+                            ?? VisualTreeHelper.GetParent(currentTarget);
         }
 
         return sources;

Snoop.Core/Controls/PropertyGrid2.xaml

-<!--
+<!--
     (c) Copyright Cory Plotts.
     This source is subject to the Microsoft Public License (Ms-PL).
     Please see http://go.microsoft.com/fwlink/?LinkID=131993 for details.
@@ -7,6 +7,7 @@
 <controls:Inspector x:Class="Snoop.Controls.PropertyGrid2"
                     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:commands="clr-namespace:Snoop.Core.Commands"
                     xmlns:controls="clr-namespace:Snoop.Controls"
                     xmlns:converters="clr-namespace:Snoop.Converters"
                     xmlns:infrastructure="clr-namespace:Snoop.Infrastructure"
@@ -100,12 +101,19 @@
 
             <DataTemplate x:Key="ValueSourceTemplate"
                           DataType="infrastructure:PropertyInformation">
-                <TextBlock Height="16"
-                           Text="{Binding ValueSourceBaseValueSource}">
-                    <TextBlock.ToolTip>
-                        <TextBlock Text="{Binding ValueSourceBaseValueSource}" />
-                    </TextBlock.ToolTip>
-                </TextBlock>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="{Binding ValueSourceBaseValueSource}">
+                        <TextBlock.ToolTip>
+                            <TextBlock Text="{Binding ValueSourceBaseValueSource}" />
+                        </TextBlock.ToolTip>
+                    </TextBlock>
+
+                    <Button Margin="2 0 0 0"
+                            Command="{Binding Path=Command, Source={x:Static commands:InheritedValueSourceHelper.Instance}}"
+                            CommandParameter="{Binding}"
+                            Content="O"
+                            Visibility="{Binding ValueSourceBaseValueSource, Converter={x:Static converters:EqualsToVisibilityConverter.DefaultInstance}, ConverterParameter=Inherited}" />
+                </StackPanel>
             </DataTemplate>
         </ResourceDictionary>
     </Grid.Resources>

Snoop.Core/Infrastructure/UIObjectNameHelper.cs

@@ -5,6 +5,16 @@
 
 public static class UIObjectNameHelper
 {
+    public static string GetNameAndType(DependencyObject? dependencyObject)
+    {
+        if (dependencyObject is null)
+        {
+            return string.Empty;
+        }
+
+        return $"{GetName(dependencyObject)} ({dependencyObject.GetType().Name})";
+    }
+
     public static string GetName(DependencyObject? dependencyObject)
     {
         var result = string.Empty;