Bind target theme variant to the popup root

4 years ago · 9933fd04ce
1 changed files with 9 additions and 0 deletions
--- a/src/Avalonia.Controls/Primitives/Popup.cs
+++ b/src/Avalonia.Controls/Primitives/Popup.cs
@ -387,6 +387,15 @@ namespace Avalonia.Controls.Primitives
                popupHost.Transform = null;
            }

+            if (popupHost is PopupRoot topLevelPopup)
+            {
+                topLevelPopup
+                    .Bind(
+                        ThemeVariantScope.ActualThemeVariantProperty,
+                        placementTarget.GetBindingObservable(ThemeVariantScope.ActualThemeVariantProperty))
+                    .DisposeWith(handlerCleanup);
+            }
+
            UpdateHostPosition(popupHost, placementTarget);

            SubscribeToEventHandler<IPopupHost, EventHandler<TemplateAppliedEventArgs>>(popupHost, RootTemplateApplied,