chore: CustomFontSymbols test

emako · Nov 19, 2024 · a5522a8 · a5522a8
1 parent e2e720d
commit a5522a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/Wpf.Ui.Test/MainWindow.xaml b/src/Wpf.Ui.Test/MainWindow.xaml
@@ -948,7 +948,17 @@
                             Orientation="Horizontal"
                             Spacing="8">
                             <Button Command="{Binding ShowReportCommand}" Content="Show Report" />
-                            <Button Command="{Binding ThrowExceptionCommand}" Content="Throw Exception" />
+                            <Button Command="{Binding ThrowExceptionCommand}">
+                                <Button.Content>
+                                    <ui:StackPanel Orientation="Horizontal" Spacing="4">
+                                        <ui:FontIcon
+                                            FontFamily="{DynamicResource CustomSymbolThemeFontFamily}"
+                                            FontSize="16"
+                                            Glyph="{x:Static ui:CustomFontSymbols.Extension}" />
+                                        <TextBlock Text="Throw Exception" />
+                                    </ui:StackPanel>
+                                </Button.Content>
+                            </Button>
                         </ui:StackPanel>
                     </StackPanel>
                 </StackPanel>

diff --git a/src/Wpf.Ui.Violeta/Resources/Wpf.Ui.xaml b/src/Wpf.Ui.Violeta/Resources/Wpf.Ui.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <FontFamily x:Key="SymbolThemeFontFamily">pack://application:,,,/Wpf.Ui.Violeta;component/Resources/Fonts/Segoe Fluent Icons.ttf#Segoe Fluent Icons</FontFamily>
-    <FontFamily x:Key="SymbolVioletaThemeFontFamily">pack://application:,,,/Wpf.Ui.Violeta;component/Resources/Fonts/Violeta Fluent Icons.ttf#Violeta Fluent Icons</FontFamily>
+    <FontFamily x:Key="CustomSymbolThemeFontFamily">pack://application:,,,/Wpf.Ui.Violeta;component/Resources/Fonts/Violeta Fluent Icons.ttf#Violeta Fluent Icons</FontFamily>
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui.Violeta;component/Resources/Variables.xaml" />
         <ResourceDictionary Source="pack://application:,,,/Wpf.Ui.Violeta;component/Controls/MessageBox/MessageBoxDialog.xaml" />