Fix Inability To Have Custom Font Sizes

reactivemarbles · Aug 2, 2024 · 982230a · 982230a
1 parent fce51e5
commit 982230a
Show file tree

Hide file tree

Showing 36 changed files with 69 additions and 42 deletions.
diff --git a/src/CrissCross.WPF.UI.Test/Views/Pages/DashboardPage.xaml b/src/CrissCross.WPF.UI.Test/Views/Pages/DashboardPage.xaml
@@ -62,6 +62,7 @@
         <ui:CheckBoxModern
             Grid.Row="1"
             Grid.Column="2"
+            FontSize="20"
             Text="I Am A Modern CheckBox" />
         <ui:CheckBox
             Grid.Row="1"
@@ -88,5 +89,15 @@
             Height="312"
             AnimateInDesignMode="True"
             Source="/Assets/working.gif" />
+        <ui:TreeView
+            Grid.Row="3"
+            Grid.Column="3"
+            FontSize="28">
+            <ui:TreeViewItem Header="Hello">
+                <ui:TreeViewItem Header="World1" />
+                <ui:TreeViewItem Header="World2" />
+            </ui:TreeViewItem>
+        </ui:TreeView>
+
     </ui:Grid>
 </ui:Page>
diff --git a/src/CrissCross.WPF.UI/Appearance/ApplicationThemeManager.cs b/src/CrissCross.WPF.UI/Appearance/ApplicationThemeManager.cs
@@ -30,7 +30,7 @@ namespace CrissCross.WPF.UI.Appearance;
 /// </example>
 public static class ApplicationThemeManager
 {
-    internal const string LibraryNamespace = "wpf.ui;";
+    internal const string LibraryNamespace = "crisscross.wpf.ui;";
 
     internal const string ThemesDictionaryPath = "pack://application:,,,/CrissCross.WPF.UI;component/Resources/Theme/";
     private static ApplicationTheme _cachedApplicationTheme = ApplicationTheme.Unknown;

diff --git a/src/CrissCross.WPF.UI/Controls/AutoSuggestBox/AutoSuggestBox.xaml b/src/CrissCross.WPF.UI/Controls/AutoSuggestBox/AutoSuggestBox.xaml
@@ -100,7 +100,7 @@
         <Setter Property="Padding" Value="{DynamicResource TextControlThemePadding}" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="BorderThickness" Value="{StaticResource AutoSuggestBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="ItemContainerStyle" Value="{StaticResource DefaultAutoSuggestBoxItemContainerStyle}" />
         <Setter Property="OverridesDefaultStyle" Value="True" />

diff --git a/src/CrissCross.WPF.UI/Controls/Button/Button.xaml b/src/CrissCross.WPF.UI/Controls/Button/Button.xaml
@@ -20,7 +20,7 @@
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
@@ -89,7 +89,7 @@
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Appearance" Value="Secondary" />

diff --git a/src/CrissCross.WPF.UI/Controls/Card/Card.xaml b/src/CrissCross.WPF.UI/Controls/Card/Card.xaml
@@ -16,7 +16,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Focusable" Value="False" />

diff --git a/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml b/src/CrissCross.WPF.UI/Controls/CardAction/CardAction.xaml
@@ -24,7 +24,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />

diff --git a/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml b/src/CrissCross.WPF.UI/Controls/CardControl/CardControl.xaml
@@ -23,7 +23,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />

diff --git a/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml b/src/CrissCross.WPF.UI/Controls/CardExpander/CardExpander.xaml
@@ -84,7 +84,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="IsExpanded" Value="False" />

diff --git a/src/CrissCross.WPF.UI/Controls/CheckBox/CheckBox.xaml b/src/CrissCross.WPF.UI/Controls/CheckBox/CheckBox.xaml
@@ -38,7 +38,7 @@
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
         <Setter Property="Focusable" Value="True" />

diff --git a/src/CrissCross.WPF.UI/Controls/ComboBox/ComboBox.xaml b/src/CrissCross.WPF.UI/Controls/ComboBox/ComboBox.xaml
@@ -144,7 +144,7 @@
         <Setter Property="Background" Value="{DynamicResource ComboBoxBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource ComboBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />

diff --git a/src/CrissCross.WPF.UI/Controls/ContentDialog/ContentDialog.xaml b/src/CrissCross.WPF.UI/Controls/ContentDialog/ContentDialog.xaml
@@ -16,7 +16,7 @@
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.IsDeferredScrollingEnabled" Value="False" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="Border.CornerRadius" Value="{DynamicResource PopupCornerRadius}" />
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="DialogMaxHeight" Value="850" />
@@ -105,7 +105,7 @@
                                                 <Style BasedOn="{StaticResource {x:Type TextBlock}}" TargetType="{x:Type TextBlock}">
                                                     <Setter Property="TextWrapping" Value="WrapWithOverflow" />
                                                     <Setter Property="TextAlignment" Value="Justify" />
-                                                    <Setter Property="FontSize" Value="14" />
+                                                    <!--<Setter Property="FontSize" Value="14" />-->
                                                 </Style>
                                             </ContentPresenter.Resources>
                                         </ContentPresenter>

diff --git a/src/CrissCross.WPF.UI/Controls/DataGrid/DataGrid.xaml b/src/CrissCross.WPF.UI/Controls/DataGrid/DataGrid.xaml
@@ -626,7 +626,7 @@
         <Setter Property="HorizontalGridLinesBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="FontSize" Value="{StaticResource DefaultDataGridFontSize}" />
+        <!--<Setter Property="FontSize" Value="{StaticResource DefaultDataGridFontSize}" />-->
         <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="ScrollViewer.PanningMode" Value="Both" />
@@ -768,7 +768,7 @@
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="Cursor" Value="Hand" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />
         <Setter Property="Focusable" Value="True" />

diff --git a/src/CrissCross.WPF.UI/Controls/DatePicker/DatePicker.xaml b/src/CrissCross.WPF.UI/Controls/DatePicker/DatePicker.xaml
@@ -67,7 +67,7 @@
         </Setter>
         <Setter Property="BorderBrush" Value="{DynamicResource ControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource DatePickerBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />

diff --git a/src/CrissCross.WPF.UI/Controls/Expander/Expander.xaml b/src/CrissCross.WPF.UI/Controls/Expander/Expander.xaml
@@ -80,7 +80,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="IsExpanded" Value="False" />

diff --git a/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.xaml b/src/CrissCross.WPF.UI/Controls/FluentNavigationWindow/FluentNavigationWindow.xaml
@@ -18,7 +18,7 @@
         <Setter Property="MinWidth" Value="518" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />

diff --git a/src/CrissCross.WPF.UI/Controls/FluentWindow/FluentWindow.xaml b/src/CrissCross.WPF.UI/Controls/FluentWindow/FluentWindow.xaml
@@ -18,7 +18,7 @@
         <Setter Property="MinWidth" Value="518" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="UseLayoutRounding" Value="True" />
         <Setter Property="SnapsToDevicePixels" Value="True" />

diff --git a/src/CrissCross.WPF.UI/Controls/HyperlinkButton/HyperlinkButton.xaml b/src/CrissCross.WPF.UI/Controls/HyperlinkButton/HyperlinkButton.xaml
@@ -20,7 +20,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Appearance" Value="Secondary" />

diff --git a/src/CrissCross.WPF.UI/Controls/InfoBar/InfoBar.xaml b/src/CrissCross.WPF.UI/Controls/InfoBar/InfoBar.xaml
@@ -20,7 +20,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="BorderBrush" Value="{DynamicResource InfoBarBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource InfoBarBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Border.CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
         <Setter Property="Focusable" Value="False" />

diff --git a/src/CrissCross.WPF.UI/Controls/ListBox/ListBox.xaml b/src/CrissCross.WPF.UI/Controls/ListBox/ListBox.xaml
@@ -7,7 +7,7 @@
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="FontSize" Value="14" />
+        <!--<Setter Property="FontSize" Value="14" />-->
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />

diff --git a/src/CrissCross.WPF.UI/Controls/ModernWindow/ModernWindow.xaml b/src/CrissCross.WPF.UI/Controls/ModernWindow/ModernWindow.xaml
@@ -15,7 +15,7 @@
     <Style TargetType="{x:Type rxNav:ModernWindow}">
         <Setter Property="BackgroundContent" Value="{DynamicResource WindowBackgroundContent}" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Foreground" Value="{DynamicResource WindowForeground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WindowBorder}" />

diff --git a/src/CrissCross.WPF.UI/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml b/src/CrissCross.WPF.UI/Controls/NavigationView/NavigationViewBasePaneButtonStyle.xaml
@@ -11,7 +11,7 @@
         <Setter Property="Foreground" Value="{DynamicResource ButtonForeground}" />
         <Setter Property="BorderBrush" Value="Transparent" />
         <Setter Property="BorderThickness" Value="{StaticResource PaneToggleButtonThickness}" />
-        <Setter Property="FontSize" Value="16" />
+        <!--<Setter Property="FontSize" Value="16" />-->
         <Setter Property="MinHeight" Value="{StaticResource PaneToggleButtonHeight}" />
         <Setter Property="MinWidth" Value="{StaticResource PaneToggleButtonWidth}" />
         <Setter Property="Padding" Value="10" />

diff --git a/src/CrissCross.WPF.UI/Controls/NumberBox/NumberBox.xaml b/src/CrissCross.WPF.UI/Controls/NumberBox/NumberBox.xaml
@@ -25,7 +25,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource NumberBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />

diff --git a/src/CrissCross.WPF.UI/Controls/PasswordBox/PasswordBox.xaml b/src/CrissCross.WPF.UI/Controls/PasswordBox/PasswordBox.xaml
@@ -29,7 +29,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource PasswordBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
@@ -115,7 +115,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource PasswordBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />

diff --git a/src/CrissCross.WPF.UI/Controls/RadioButton/RadioButton.xaml b/src/CrissCross.WPF.UI/Controls/RadioButton/RadioButton.xaml
@@ -25,7 +25,7 @@
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="MinWidth" Value="120" />
         <Setter Property="KeyboardNavigation.IsTabStop" Value="True" />

diff --git a/src/CrissCross.WPF.UI/Controls/RichTextBox/RichTextBox.xaml b/src/CrissCross.WPF.UI/Controls/RichTextBox/RichTextBox.xaml
@@ -14,7 +14,7 @@
         <Setter Property="MinHeight" Value="34" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Padding" Value="6,4" />
-        <Setter Property="FontSize" Value="14" />
+        <!--<Setter Property="FontSize" Value="14" />-->
         <Setter Property="SnapsToDevicePixels" Value="True" />
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Template">

diff --git a/src/CrissCross.WPF.UI/Controls/TextBlock/TextBlock.xaml b/src/CrissCross.WPF.UI/Controls/TextBlock/TextBlock.xaml
@@ -2,7 +2,7 @@
 
     <Style TargetType="{x:Type TextBlock}">
         <Setter Property="Background" Value="Transparent" />
-        <Setter Property="FontSize" Value="14" />
+        <!--<Setter Property="FontSize" Value="14" />-->
         <Setter Property="Margin" Value="0" />
         <Setter Property="Padding" Value="0" />
         <Setter Property="Focusable" Value="False" />

diff --git a/src/CrissCross.WPF.UI/Controls/TextBox/TextBox.xaml b/src/CrissCross.WPF.UI/Controls/TextBox/TextBox.xaml
@@ -24,7 +24,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource TextBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
@@ -305,7 +305,7 @@
         <Setter Property="Background" Value="{DynamicResource TextControlBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource TextControlElevationBorderBrush}" />
         <Setter Property="BorderThickness" Value="{StaticResource TextBoxBorderThemeThickness}" />
-        <Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />-->
         <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />