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
parent
commit
87a8e22f62
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/Avalonia.Controls/Primitives/VisualLayerManager.cs
  2. 1
      src/Avalonia.Themes.Default/MenuItem.xaml
  3. 1
      src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml

2
src/Avalonia.Controls/Primitives/VisualLayerManager.cs

@ -67,8 +67,6 @@ namespace Avalonia.Controls.Primitives
{
get
{
if (IsPopup)
return null;
var rv = FindLayer<LightDismissOverlayLayer>();
if (rv == null)
{

1
src/Avalonia.Themes.Default/MenuItem.xaml

@ -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}"

1
src/Avalonia.Themes.Fluent/Controls/MenuItem.xaml

@ -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}">

Loading…
Cancel
Save