Browse Source

Merge branch 'master' into master

pull/4589/head
GMIKE 6 years ago
committed by GitHub
parent
commit
a2be7a5bd8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      src/Avalonia.Themes.Default/PathIcon.xaml
  2. 7
      src/Avalonia.Themes.Fluent/PathIcon.xaml

7
src/Avalonia.Themes.Default/PathIcon.xaml

@ -2,14 +2,15 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Style Selector="PathIcon"> <Style Selector="PathIcon">
<Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" /> <Setter Property="Foreground" Value="{DynamicResource ThemeForegroundColor}" />
<Setter Property="Height" Value="16" /> <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
<Setter Property="Width" Value="16" /> <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Viewbox Height="{TemplateBinding Height}" <Viewbox Height="{TemplateBinding Height}"
Width="{TemplateBinding Width}"> Width="{TemplateBinding Width}">
<Path Fill="{TemplateBinding Foreground}" <Path Fill="{TemplateBinding Foreground}"
Data="{TemplateBinding Data}" /> Data="{TemplateBinding Data}"
Stretch="Uniform" />
</Viewbox> </Viewbox>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>

7
src/Avalonia.Themes.Fluent/PathIcon.xaml

@ -10,14 +10,15 @@
</Design.PreviewWith> </Design.PreviewWith>
<Style Selector="PathIcon"> <Style Selector="PathIcon">
<Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" /> <Setter Property="Foreground" Value="{DynamicResource TextControlForeground}" />
<Setter Property="Height" Value="16" /> <Setter Property="Height" Value="{DynamicResource IconElementThemeHeight}" />
<Setter Property="Width" Value="16" /> <Setter Property="Width" Value="{DynamicResource IconElementThemeWidth}" />
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<Viewbox Height="{TemplateBinding Height}" <Viewbox Height="{TemplateBinding Height}"
Width="{TemplateBinding Width}"> Width="{TemplateBinding Width}">
<Path Fill="{TemplateBinding Foreground}" <Path Fill="{TemplateBinding Foreground}"
Data="{TemplateBinding Data}" /> Data="{TemplateBinding Data}"
Stretch="Uniform" />
</Viewbox> </Viewbox>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>

Loading…
Cancel
Save