tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
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 3 years ago
committed by GitHub
parent
db15cdc590
commit
b690554db5
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

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

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

Write Preview
Loading…
Cancel
Save