Skip to content

Commit a5522a8

Browse files
committed
chore: CustomFontSymbols test
1 parent e2e720d commit a5522a8

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/Wpf.Ui.Test/MainWindow.xaml

+11-1
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,17 @@
948948
Orientation="Horizontal"
949949
Spacing="8">
950950
<Button Command="{Binding ShowReportCommand}" Content="Show Report" />
951-
<Button Command="{Binding ThrowExceptionCommand}" Content="Throw Exception" />
951+
<Button Command="{Binding ThrowExceptionCommand}">
952+
<Button.Content>
953+
<ui:StackPanel Orientation="Horizontal" Spacing="4">
954+
<ui:FontIcon
955+
FontFamily="{DynamicResource CustomSymbolThemeFontFamily}"
956+
FontSize="16"
957+
Glyph="{x:Static ui:CustomFontSymbols.Extension}" />
958+
<TextBlock Text="Throw Exception" />
959+
</ui:StackPanel>
960+
</Button.Content>
961+
</Button>
952962
</ui:StackPanel>
953963
</StackPanel>
954964
</StackPanel>

src/Wpf.Ui.Violeta/Resources/Wpf.Ui.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
22
<FontFamily x:Key="SymbolThemeFontFamily">pack://application:,,,/Wpf.Ui.Violeta;component/Resources/Fonts/Segoe Fluent Icons.ttf#Segoe Fluent Icons</FontFamily>
3-
<FontFamily x:Key="SymbolVioletaThemeFontFamily">pack://application:,,,/Wpf.Ui.Violeta;component/Resources/Fonts/Violeta Fluent Icons.ttf#Violeta Fluent Icons</FontFamily>
3+
<FontFamily x:Key="CustomSymbolThemeFontFamily">pack://application:,,,/Wpf.Ui.Violeta;component/Resources/Fonts/Violeta Fluent Icons.ttf#Violeta Fluent Icons</FontFamily>
44
<ResourceDictionary.MergedDictionaries>
55
<ResourceDictionary Source="pack://application:,,,/Wpf.Ui.Violeta;component/Resources/Variables.xaml" />
66
<ResourceDictionary Source="pack://application:,,,/Wpf.Ui.Violeta;component/Controls/MessageBox/MessageBoxDialog.xaml" />

0 commit comments

Comments
 (0)