Browse Source
Merge pull request #5295 from AvaloniaUI/fix-combobox-inside-of-popup
Enable light dismiss overlay for popups 2
pull/5414/head
Steven Kirk
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
2 additions and
2 deletions
-
src/Avalonia.Controls/Primitives/VisualLayerManager.cs
-
src/Avalonia.Themes.Default/MenuItem.xaml
-
src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml
|
|
|
@ -67,8 +67,6 @@ namespace Avalonia.Controls.Primitives |
|
|
|
{ |
|
|
|
get |
|
|
|
{ |
|
|
|
if (IsPopup) |
|
|
|
return null; |
|
|
|
var rv = FindLayer<LightDismissOverlayLayer>(); |
|
|
|
if (rv == null) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -60,6 +60,7 @@ |
|
|
|
<Popup Name="PART_Popup" |
|
|
|
PlacementMode="Right" |
|
|
|
IsLightDismissEnabled="True" |
|
|
|
OverlayInputPassThroughElement="{Binding $parent[MenuItem]}" |
|
|
|
IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"> |
|
|
|
<Border Background="{TemplateBinding Background}" |
|
|
|
BorderBrush="{DynamicResource ThemeBorderMidBrush}" |
|
|
|
|
|
|
|
@ -112,6 +112,7 @@ |
|
|
|
<Popup Name="PART_Popup" |
|
|
|
WindowManagerAddShadowHint="False" |
|
|
|
PlacementMode="Right" |
|
|
|
OverlayInputPassThroughElement="{Binding $parent[MenuItem]}" |
|
|
|
HorizontalOffset="{DynamicResource MenuFlyoutSubItemPopupHorizontalOffset}" |
|
|
|
IsLightDismissEnabled="True" |
|
|
|
IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}"> |
|
|
|
|