From 03bc5a475299e0010c3b74071a0bb974f2251ec7 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 10 Feb 2022 22:17:17 -0500
Subject: [PATCH] Merge pull request #7576 from pr8x/button-flyout-diagnostics

DevTools: Enable inspection for Button.Flyout
---
 .../Diagnostics/ViewModels/VisualTreeNode.cs                | 6 +++++-
 .../Diagnostics/Views/MainWindow.xaml.cs                    | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
index 6a430897ba..81a19d0550 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
@@ -77,7 +77,8 @@ namespace Avalonia.Diagnostics.ViewModels
                             c.GetObservable(Control.ContextMenuProperty),
                             c.GetObservable(FlyoutBase.AttachedFlyoutProperty),
                             c.GetObservable(ToolTipDiagnostics.ToolTipProperty),
-                            (ContextFlyout, ContextMenu, AttachedFlyout, ToolTip) =>
+                            c.GetObservable(Button.FlyoutProperty),
+                            (ContextFlyout, ContextMenu, AttachedFlyout, ToolTip, ButtonFlyout) =>
                             {
                                 if (ContextMenu != null)
                                     //Note: ContextMenus are special since all the items are added as visual children.
@@ -93,6 +94,9 @@ namespace Avalonia.Diagnostics.ViewModels
                                 if (ToolTip != null)
                                     return GetPopupHostObservable(ToolTip, "ToolTip");
 
+                                if (ButtonFlyout != null)
+                                    return GetPopupHostObservable(ButtonFlyout, "Flyout");
+
                                 return Observable.Return<PopupRoot?>(null);
                             })
                         .Switch(),
diff --git a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
index 62bfdb5186..fb808a1ea5 100644
--- a/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
+++ b/src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
@@ -147,6 +147,7 @@ namespace Avalonia.Diagnostics.Views
                 ProcessProperty(control, ContextMenuProperty);
                 ProcessProperty(control, FlyoutBase.AttachedFlyoutProperty);
                 ProcessProperty(control, ToolTipDiagnostics.ToolTipProperty);
+                ProcessProperty(control, Button.FlyoutProperty);
             }
 
             return popupRoots;