Browse Source
Merge pull request #7576 from pr8x/button-flyout-diagnostics
DevTools: Enable inspection for Button.Flyout
pull/7587/head
Max Katz
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
1 deletions
-
src/Avalonia.Diagnostics/Diagnostics/ViewModels/VisualTreeNode.cs
-
src/Avalonia.Diagnostics/Diagnostics/Views/MainWindow.xaml.cs
|
|
|
@ -84,7 +84,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.
|
|
|
|
@ -100,6 +101,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(), |
|
|
|
|
|
|
|
@ -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; |
|
|
|
|