Browse Source
Merge branch 'master' into render-inside-win-ui-comp-tree
win-ui-comp-with-manual-fbo
danwalmsley
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
8 additions and
6 deletions
-
src/Avalonia.Themes.Default/PathIcon.xaml
-
src/Avalonia.Themes.Fluent/PathIcon.xaml
|
|
|
@ -2,14 +2,15 @@ |
|
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> |
|
|
|
<Style Selector="PathIcon"> |
|
|
|
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" /> |
|
|
|
<Setter Property="Height" Value="16" /> |
|
|
|
<Setter Property="Width" Value="16" /> |
|
|
|
<Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" /> |
|
|
|
<Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" /> |
|
|
|
<Setter Property="Template"> |
|
|
|
<ControlTemplate> |
|
|
|
<Viewbox Height="{TemplateBinding Height}" |
|
|
|
Width="{TemplateBinding Width}"> |
|
|
|
<Path Fill="{TemplateBinding Foreground}" |
|
|
|
Data="{TemplateBinding Data}" /> |
|
|
|
Data="{TemplateBinding Data}" |
|
|
|
Stretch="Uniform" /> |
|
|
|
</Viewbox> |
|
|
|
</ControlTemplate> |
|
|
|
</Setter> |
|
|
|
|
|
|
|
@ -10,14 +10,15 @@ |
|
|
|
</Design.PreviewWith> |
|
|
|
<Style Selector="PathIcon"> |
|
|
|
<Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" /> |
|
|
|
<Setter Property="Height" Value="16" /> |
|
|
|
<Setter Property="Width" Value="16" /> |
|
|
|
<Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" /> |
|
|
|
<Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" /> |
|
|
|
<Setter Property="Template"> |
|
|
|
<ControlTemplate> |
|
|
|
<Viewbox Height="{TemplateBinding Height}" |
|
|
|
Width="{TemplateBinding Width}"> |
|
|
|
<Path Fill="{TemplateBinding Foreground}" |
|
|
|
Data="{TemplateBinding Data}" /> |
|
|
|
Data="{TemplateBinding Data}" |
|
|
|
Stretch="Uniform" /> |
|
|
|
</Viewbox> |
|
|
|
</ControlTemplate> |
|
|
|
</Setter> |
|
|
|
|