Browse Source
Merge pull request #5499 from AvaloniaUI/fixes/5475-submenu-interaction
Turn off light dismiss for non-toplevel menus.
pull/5606/head
Dan Walmsley
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
4 deletions
-
src/Avalonia.Themes.Default/MenuItem.xaml
-
src/Avalonia.Themes.Fluent/Controls/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}" |
|
|
|
|
|
|
|
@ -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}" |
|
|
|
|