Browse Source

1.misspelled word invalidates the background(SplitView lightDismiss). (#15185)

2.make sure mask is invisible in inline mode. use dynamic brush.
pull/15190/head
JIIIIL 2 years ago
committed by GitHub
parent
commit
b690554db5
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      src/Avalonia.Themes.Fluent/Controls/SplitView.xaml
  2. 6
      src/Avalonia.Themes.Simple/Controls/SplitView.xaml

4
src/Avalonia.Themes.Fluent/Controls/SplitView.xaml

@ -139,7 +139,7 @@
<ContentPresenter x:Name="PART_ContentPresenter"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
<Rectangle Name="LightDismissLayer"/>
<Rectangle Name="LightDismissLayer" IsVisible="False"/>
</Panel>
</Grid>
@ -237,7 +237,7 @@
</Style>
</Style>
<Style Selector="^:lightdismiss /template/ Rectangle#LightDismissLayer">
<Style Selector="^:lightDismiss /template/ Rectangle#LightDismissLayer">
<Setter Property="Fill" Value="{DynamicResource SplitViewLightDismissOverlayBackground}" />
</Style>
<Style Selector="^:overlay:open /template/ Rectangle#LightDismissLayer">

6
src/Avalonia.Themes.Simple/Controls/SplitView.xaml

@ -55,7 +55,7 @@
<Panel Name="ContentRoot">
<ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
<Rectangle Name="LightDismissLayer" />
<Rectangle Name="LightDismissLayer" IsVisible="False"/>
</Panel>
</Grid>
@ -138,7 +138,7 @@
<Panel Name="ContentRoot">
<ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
<Rectangle Name="LightDismissLayer" />
<Rectangle Name="LightDismissLayer" IsVisible="False"/>
</Panel>
</Grid>
@ -238,7 +238,7 @@
<Setter Property="IsVisible" Value="False" />
<Setter Property="Fill" Value="Transparent" />
</Style>
<Style Selector="^:lightdismiss /template/ Rectangle#LightDismissLayer">
<Style Selector="^:lightDismiss /template/ Rectangle#LightDismissLayer">
<Setter Property="Fill">
<SolidColorBrush Color="{DynamicResource ThemeControlLowColor}" Opacity="0.6" />
</Setter>

Loading…
Cancel
Save