Port microsoft/microsoft-ui-xaml#4743 (Kinnara#648)

pipeline-foundation · Dec 10, 2023 · 74b228e · 74b228e
1 parent de437bd
commit 74b228e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 5 deletions.
diff --git a/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.cs b/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyout.cs
@@ -209,11 +209,6 @@ protected override Control CreatePresenter()
         {
             var commandBar = new CommandBarFlyoutCommandBar();
 
-            commandBar.Opened += delegate
-            {
-                SetCurrentValue(ShowModeProperty, FlyoutShowMode.Standard);
-            };
-
             SharedHelpers.CopyList(PrimaryCommands, commandBar.PrimaryCommands);
             SharedHelpers.CopyList(SecondaryCommands, commandBar.SecondaryCommands);
 
@@ -235,6 +230,13 @@ protected override Control CreatePresenter()
                 IsDefaultShadowEnabled = false
             };
 
+            m_presenter = presenter;
+
+            commandBar.Opened += delegate
+            {
+                SetCurrentValue(ShowModeProperty, FlyoutShowMode.Standard);
+            };
+
             commandBar.SetOwningFlyout(this);
 
             m_commandBar = commandBar;
@@ -270,6 +272,11 @@ private void SetSecondaryCommandsToCloseWhenExecuted()
             }
         }
 
+        internal FlyoutPresenter GetPresenter()
+        {
+            return m_presenter;
+        }
+
         private static void RevokeAndRemove(IDictionary<ICommandBarElement, RoutedEventHandlerRevoker> map, ICommandBarElement element)
         {
             if (map.TryGetValue(element, out var revoker))
@@ -297,6 +304,8 @@ private static void RevokeAndClear(IDictionary<ICommandBarElement, RoutedEventHa
         Dictionary<ICommandBarElement, RoutedEventHandlerRevoker> m_secondaryToggleButtonUncheckedRevokerByElementMap =
             new Dictionary<ICommandBarElement, RoutedEventHandlerRevoker>();
 
+        FlyoutPresenter m_presenter;
+
         bool m_isClosingAfterCloseAnimation;
     }
 }
diff --git a/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyoutToolBar.cs b/ModernWpf.Controls/CommandBarFlyout/CommandBarFlyoutToolBar.cs
@@ -9,6 +9,7 @@
 using System.Windows.Automation;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media.Animation;
 using System.Windows.Threading;
@@ -179,6 +180,13 @@ public override void OnApplyTemplate()
                 }
             }
 
+            // Keep the owning FlyoutPresenter's corner radius in sync with the
+            // primary commands's corner radius.
+            if (SharedHelpers.IsRS5OrHigher())
+            {
+                BindOwningFlyoutPresenterToCornerRadius();
+            }
+
             if (OverflowPopup is PopupEx popupEx)
             {
                 popupEx.SuppressFadeAnimation = true;
@@ -1028,6 +1036,24 @@ internal void ClearShadow()
         {
         }
 
+        void BindOwningFlyoutPresenterToCornerRadius()
+        {
+            if (TryGetOwningFlyout(out var actualFlyout))
+            {
+                if (GetTemplateChild("LayoutRoot") is Border root)
+                {
+                    Binding binding = new();
+                    binding.Source = root;
+                    binding.Path = new PropertyPath("CornerRadius");
+                    binding.Mode = BindingMode.OneWay;
+                    if (actualFlyout.GetPresenter() is { } presenter)
+                    {
+                        presenter.SetBinding(ControlHelper.CornerRadiusProperty, binding);
+                    }
+                }
+            }
+        }
+
         private void SecondaryItemsRootSizeChanged(object sender, SizeChangedEventArgs e)
         {
             //m_secondaryItemsRootSized = true;