Browse Source

Flyout presenter styles use CornerRadius property

pull/5682/head
amwx 5 years ago
parent
commit
dae531f73f
  1. 7
      src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml
  2. 7
      src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml

7
src/Avalonia.Themes.Fluent/Controls/FlyoutPresenter.xaml

@ -17,13 +17,15 @@
<Setter Property="MaxHeight" Value="{DynamicResource FlyoutThemeMaxHeight}" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
<Setter Property="Template">
<ControlTemplate>
<Border Name="LayoutRoot"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Padding="{DynamicResource FlyoutBorderThemePadding}">
Padding="{DynamicResource FlyoutBorderThemePadding}"
CornerRadius="{TemplateBinding CornerRadius}">
<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
<ContentPresenter Content="{TemplateBinding Content}"
@ -38,7 +40,4 @@
</ControlTemplate>
</Setter>
</Style>
<Style Selector="FlyoutPresenter /template/ Border#LayoutRoot">
<Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
</Style>
</Styles>

7
src/Avalonia.Themes.Fluent/Controls/MenuFlyoutPresenter.xaml

@ -9,13 +9,15 @@
<Setter Property="MinHeight" Value="{DynamicResource MenuFlyoutThemeMinHeight}" />
<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
<Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
<Setter Property="Template">
<ControlTemplate>
<Border Name="LayoutRoot"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="{TemplateBinding BorderThickness}"
Padding="{DynamicResource FlyoutBorderThemePadding}">
Padding="{DynamicResource FlyoutBorderThemePadding}"
CornerRadius="{TemplateBinding CornerRadius}">
<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
<ItemsPresenter Name="PART_ItemsPresenter"
@ -30,7 +32,4 @@
</ControlTemplate>
</Setter>
</Style>
<Style Selector="MenuFlyoutPresenter /template/ Border#LayoutRoot">
<Setter Property="CornerRadius" Value="{DynamicResource OverlayCornerRadius}" />
</Style>
</Styles>

Loading…
Cancel
Save