ソースを参照

Merge pull request #5499 from AvaloniaUI/fixes/5475-submenu-interaction

Turn off light dismiss for non-toplevel menus.
Dan Walmsley 4 年 前
コミット
4350deb24c

+ 1 - 2
src/Avalonia.Themes.Default/MenuItem.xaml

@@ -59,8 +59,7 @@
                   Grid.Column="4"/>
             <Popup Name="PART_Popup"
                    PlacementMode="Right"
-                   IsLightDismissEnabled="True"
-                   OverlayInputPassThroughElement="{Binding $parent[MenuItem]}"
+                   IsLightDismissEnabled="False"
                    IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
               <Border Background="{TemplateBinding Background}"
                       BorderBrush="{DynamicResource ThemeBorderMidBrush}"

+ 1 - 2
src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml

@@ -112,9 +112,8 @@
           <Popup Name="PART_Popup"
                  WindowManagerAddShadowHint="False"
                  PlacementMode="Right"
-                 OverlayInputPassThroughElement="{Binding $parent[MenuItem]}"
                  HorizontalOffset="{DynamicResource MenuFlyoutSubItemPopupHorizontalOffset}"
-                 IsLightDismissEnabled="True"
+                 IsLightDismissEnabled="False"
                  IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
             <Border Background="{DynamicResource MenuFlyoutPresenterBackground}"
                     BorderBrush="{DynamicResource MenuFlyoutPresenterBorderBrush}"