FontFamily is now set only once at the root of the xaml in the samples.

Noesis · Nov 29, 2017 · a6dfa12 · a6dfa12
1 parent fe9c1a8
commit a6dfa12
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/Samples/Buttons/Unity/Assets/NoesisGUI/Samples/Buttons/ControlResources.xaml b/Samples/Buttons/Unity/Assets/NoesisGUI/Samples/Buttons/ControlResources.xaml
@@ -11,7 +11,6 @@
         </Style.Triggers>
         <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="FontFamily" Value="./#Aero Matics"/>
         <Setter Property="FontSize" Value="48"/>
         <Setter Property="Template">
             <Setter.Value>

diff --git a/Samples/Buttons/Unity/Assets/NoesisGUI/Samples/Buttons/MainWindow.xaml b/Samples/Buttons/Unity/Assets/NoesisGUI/Samples/Buttons/MainWindow.xaml
@@ -4,7 +4,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
     xmlns:local="clr-namespace:Buttons"
     x:Class="Buttons.MainWindow"
-    d:DesignWidth="1280" d:DesignHeight="720">
+    d:DesignWidth="1280" d:DesignHeight="720"
+    FontFamily="./#Aero Matics">
 
     <UserControl.Resources>
         <ResourceDictionary>

diff --git a/Samples/Login/Unity/Assets/NoesisGUI/Samples/Login/ControlResources.xaml b/Samples/Login/Unity/Assets/NoesisGUI/Samples/Login/ControlResources.xaml
@@ -11,7 +11,6 @@
         </Style.Triggers>
         <Setter Property="OverridesDefaultStyle" Value="True"/>
         <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="FontFamily" Value="./#Aero Matics"/>
         <Setter Property="FontSize" Value="48"/>
         <Setter Property="Template">
             <Setter.Value>
@@ -258,7 +257,8 @@
                 <Setter Property="local:ElementExtensions.FocusOnHover" Value="True"/>
             </Trigger>
         </Style.Triggers>
-        <Setter Property="FontFamily" Value="./#Aero Matics"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="FontSize" Value="12"/>
         <Setter Property="Foreground" Value="White"/>
         <Setter Property="CaretBrush" Value="White"/>
@@ -373,7 +373,8 @@
                 <Setter Property="local:ElementExtensions.FocusOnHover" Value="True"/>
             </Trigger>
         </Style.Triggers>
-        <Setter Property="FontFamily" Value="./#Aero Matics"/>
+        <Setter Property="OverridesDefaultStyle" Value="True"/>
+        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
         <Setter Property="FontSize" Value="12"/>
         <Setter Property="Foreground" Value="White"/>
         <Setter Property="CaretBrush" Value="White"/>

diff --git a/Samples/Login/Unity/Assets/NoesisGUI/Samples/Login/MainWindow.xaml b/Samples/Login/Unity/Assets/NoesisGUI/Samples/Login/MainWindow.xaml
@@ -7,7 +7,7 @@
     d:DesignWidth="1280" d:DesignHeight="720"
     FontFamily="./#Aero Matics"
     Foreground="#FF488EB5">
-    
+
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

diff --git a/Samples/QuestLog/Unity/Assets/NoesisGUI/Samples/QuestLog/MainWindow.xaml b/Samples/QuestLog/Unity/Assets/NoesisGUI/Samples/QuestLog/MainWindow.xaml
@@ -254,6 +254,8 @@
                 </Grid>
             </ControlTemplate>
             <Style x:Key="QuestListStyle" TargetType="{x:Type ListBox}">
+                <Setter Property="OverridesDefaultStyle" Value="True"/>
+                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                 <Setter Property="Foreground" Value="White"/>
                 <Setter Property="Template" Value="{StaticResource QuestListTemplate}"/>
             </Style>
@@ -374,10 +376,11 @@
                         <Setter Property="local:ElementExtensions.FocusOnHover" Value="True"/>
                     </Trigger>
                 </Style.Triggers>
+                <Setter Property="OverridesDefaultStyle" Value="True"/>
+                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
                 <Setter Property="Foreground" Value="#FF80C4EA"/>
                 <Setter Property="FontSize" Value="10"/>
                 <Setter Property="Template" Value="{StaticResource QuestListItemTemplate}"/>
-                <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
             </Style>
         </ResourceDictionary>
     </UserControl.Resources>