Make font aliasing optional

BAndysc · Dec 28, 2024 · 82339f9 · 82339f9
1 parent 13fe73f
commit 82339f9
Show file tree

Hide file tree

Showing 19 changed files with 70 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -52,6 +52,14 @@ While Windows 9x used the bitmap font MS Sans Serif for its distinctive appearan
 
 Tahoma is available on Windows and macOS, but not Linux. A free alternative, 'Wine Tahoma Regular,' is distributed under the GNU Lesser General Public License, but I’m unsure if it’s compatible with the MIT license. Any insights would be appreciated.
 
+#### Font aliasing
+
+For the old look and feel, Classic.Avalonia disables antialiasing (smoothing) for font rendering. If for some reason, you would like to use Classic.Avalonia **with** font antialiasing, set property `FontAliasing` on the `ClassicTheme`:
+
+```
+<classic:ClassicTheme FontAliasing="False" />
+```
+
 ## Custom Controls
 
 `Classic.Avalonia` introduces several custom controls with a classic appearance and behavior.

diff --git a/samples/AvaloniaVisualBasic/Controls/MDIWindow.axaml b/samples/AvaloniaVisualBasic/Controls/MDIWindow.axaml
@@ -25,7 +25,7 @@
                                 <TextBlock Text="{TemplateBinding Title}"
                                            VerticalAlignment="Center"
                                            HorizontalAlignment="Stretch"
-                                           RenderOptions.TextRenderingMode="Alias"
+                                           utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}"
                                            FontFamily="{DynamicResource {x:Static commonControls:NonClientMetrics.CaptionFontKey}}"
                                            FontSize="{DynamicResource {x:Static commonControls:NonClientMetrics.CaptionFontSizeKey}}"
                                            IsHitTestVisible="False"

diff --git a/samples/AvaloniaVisualBasic/Forms/Views/FormEditView.axaml b/samples/AvaloniaVisualBasic/Forms/Views/FormEditView.axaml
@@ -34,7 +34,7 @@
                         <TextBlock Text="Form1"
                                    VerticalAlignment="Center"
                                    HorizontalAlignment="Stretch"
-                                   RenderOptions.TextRenderingMode="Alias"
+                                   utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}"
                                    FontFamily="{DynamicResource {x:Static commonControls:NonClientMetrics.CaptionFontKey}}"
                                    FontSize="{DynamicResource {x:Static commonControls:NonClientMetrics.CaptionFontSizeKey}}"
                                    IsHitTestVisible="False"

diff --git a/src/Classic.Avalonia.Theme/ClassicTheme.axaml.cs b/src/Classic.Avalonia.Theme/ClassicTheme.axaml.cs
@@ -7,13 +7,15 @@
 using Avalonia.Markup.Xaml;
 using Avalonia.Metadata;
 using Avalonia.Styling;
+using Classic.CommonControls;
 
 [assembly: XmlnsDefinition("https://github.com/avaloniaui", "Classic.Avalonia.Theme")]
 
 namespace Classic.Avalonia.Theme;
 
 public class ClassicTheme : Styles
 {
+    public static readonly StyledProperty<bool> FontAliasingProperty = AvaloniaProperty.Register<ClassicTheme, bool>(nameof(FontAliasing), defaultValue: true);
     public static ThemeVariant Standard { get; } = new("Standard", ThemeVariant.Light);
     public static ThemeVariant Classic { get; } = new("Classic", ThemeVariant.Light);
     public static ThemeVariant Brick { get; } = new("Brick", ThemeVariant.Light);
@@ -52,6 +54,11 @@ static void UpdateRangeClasses(RangeBase bar)
                 window.Classes.Add("__classic_theme_is_mac");
             });
         }
+
+        FontAliasingProperty.Changed.AddClassHandler<ClassicTheme>((theme, e) =>
+        {
+            theme.Resources[SystemParameters.FontAliasingKey] = e.GetNewValue<bool>();
+        });
     }
 
     /// <summary>
@@ -62,4 +69,10 @@ public ClassicTheme(IServiceProvider? sp = null)
     {
         AvaloniaXamlLoader.Load(sp, this);
     }
+
+    public bool FontAliasing
+    {
+        get => GetValue(FontAliasingProperty);
+        set => SetValue(FontAliasingProperty, value);
+    }
 }
diff --git a/src/Classic.Avalonia.Theme/Styles/AutoAttachTitleBar.axaml b/src/Classic.Avalonia.Theme/Styles/AutoAttachTitleBar.axaml
@@ -36,7 +36,6 @@
             <TextBlock Text="{Binding $parent[Window].Title}"
                        VerticalAlignment="Center"
                        HorizontalAlignment="Stretch"
-                       RenderOptions.TextRenderingMode="Alias"
                        FontFamily="{DynamicResource {x:Static common:NonClientMetrics.CaptionFontKey}}"
                        FontSize="{DynamicResource {x:Static common:NonClientMetrics.CaptionFontSizeKey}}"
                        IsHitTestVisible="False"

diff --git a/src/Classic.Avalonia.Theme/Styles/CalendarDatePicker.axaml b/src/Classic.Avalonia.Theme/Styles/CalendarDatePicker.axaml
@@ -2,6 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:common="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
                     xmlns:classic="clr-namespace:Classic.Avalonia.Theme"
+                    xmlns:utils="clr-namespace:Classic.Avalonia.Theme.Utils"
                     x:ClassModifier="internal">
   <Design.PreviewWith>
     <Border Height="200"
@@ -79,7 +80,7 @@
                         DisplayDateStart="{TemplateBinding DisplayDateStart}"
                         FirstDayOfWeek="{TemplateBinding FirstDayOfWeek}"
                         IsTodayHighlighted="{TemplateBinding IsTodayHighlighted}"
-                        RenderOptions.TextRenderingMode="Alias"
+                        utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}"
                         RenderOptions.EdgeMode="Aliased"
                         SelectedDate="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedDate,
                                                        Mode=TwoWay}" />

diff --git a/src/Classic.Avalonia.Theme/Styles/ComboBox.axaml b/src/Classic.Avalonia.Theme/Styles/ComboBox.axaml
@@ -3,6 +3,7 @@
                     xmlns:classic="clr-namespace:Classic.Avalonia.Theme"
                     xmlns:common="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
                     xmlns:controls="clr-namespace:Classic.Avalonia.Theme.Controls"
+                    xmlns:utils="clr-namespace:Classic.Avalonia.Theme.Utils"
                     x:ClassModifier="internal">
   <Design.PreviewWith>
           <ComboBox Width="200" IsEnabled="False"></ComboBox>
@@ -102,7 +103,7 @@
                 <Border x:Name="DropDownBorder"
                         Background="{DynamicResource {x:Static common:SystemColors.WindowBrushKey}}"
                         BorderThickness="1"
-                        RenderOptions.TextRenderingMode="Alias"
+                        utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}"
                         BorderBrush="{DynamicResource {x:Static common:SystemColors.WindowFrameBrushKey}}">
                     <ScrollViewer Name="DropDownScrollViewer"
                                   HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"

diff --git a/src/Classic.Avalonia.Theme/Styles/DatePicker.axaml b/src/Classic.Avalonia.Theme/Styles/DatePicker.axaml
@@ -3,6 +3,7 @@
                     xmlns:sys="using:System"
                     xmlns:classic="clr-namespace:Classic.Avalonia.Theme"
                     xmlns:common="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
+                    xmlns:utils="clr-namespace:Classic.Avalonia.Theme.Utils"
                     x:ClassModifier="internal">
   <Design.PreviewWith>
     <Border Padding="20">
@@ -166,7 +167,7 @@
                      Placement="Bottom"
                      PlacementTarget="{Binding #PART_FlyoutButton}"
                      WindowManagerAddShadowHint="False">
-                <DatePickerPresenter Name="PART_PickerPresenter" RenderOptions.TextRenderingMode="Alias" />
+                <DatePickerPresenter Name="PART_PickerPresenter" utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}" />
               </Popup>
             </Grid>
           </classic:ClassicBorderDecorator>

diff --git a/src/Classic.Avalonia.Theme/Styles/FlyoutPresenter.axaml b/src/Classic.Avalonia.Theme/Styles/FlyoutPresenter.axaml
@@ -2,6 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:classic="clr-namespace:Classic.Avalonia.Theme"
                     xmlns:common="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
+                    xmlns:utils="clr-namespace:Classic.Avalonia.Theme.Utils"
                     x:ClassModifier="internal">
   <ControlTheme x:Key="{x:Type FlyoutPresenter}"
                 TargetType="FlyoutPresenter">
@@ -19,7 +20,7 @@
                                         Background="{TemplateBinding Background}"
                                         RenderOptions.EdgeMode="Aliased"
                                         RenderOptions.BitmapInterpolationMode="None"
-                                        RenderOptions.TextRenderingMode="Alias"
+                                        utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}"
                                         BorderThickness="{TemplateBinding BorderThickness}">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                         VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">

diff --git a/src/Classic.Avalonia.Theme/Styles/ManagedFileChooser.axaml b/src/Classic.Avalonia.Theme/Styles/ManagedFileChooser.axaml
@@ -5,6 +5,7 @@
                     xmlns:converters="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls"
                     xmlns:common="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
                     xmlns:classic="clr-namespace:Classic.Avalonia.Theme"
+                    xmlns:utils="clr-namespace:Classic.Avalonia.Theme.Utils"
                     x:ClassModifier="internal">
   <Design.PreviewWith>
     <dialogs:ManagedFileChooser Width="555" Height="384"/>
@@ -80,7 +81,7 @@
                 BorderThickness="{TemplateBinding BorderThickness}"
                 CornerRadius="{TemplateBinding CornerRadius}"
                 Padding="{TemplateBinding Padding}"
-                RenderOptions.TextRenderingMode="Alias">
+                utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}">
           <DockPanel Margin="5">
             <DockPanel Margin="0,0,75,5"
                        DockPanel.Dock="Top">

diff --git a/src/Classic.Avalonia.Theme/Styles/Menu.axaml b/src/Classic.Avalonia.Theme/Styles/Menu.axaml
@@ -46,7 +46,6 @@
                   <ItemsPresenter Name="PART_ItemsPresenter"
                                   Margin="1"
                                   Grid.IsSharedSizeScope="True"
-                                  RenderOptions.TextRenderingMode="Alias"
                                   ItemsPanel="{TemplateBinding ItemsPanel}" />
                 </ScrollViewer>
               </classic:ClassicBorderDecorator>

diff --git a/src/Classic.Avalonia.Theme/Styles/MenuFlyoutPresenter.axaml b/src/Classic.Avalonia.Theme/Styles/MenuFlyoutPresenter.axaml
@@ -2,6 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:classic="clr-namespace:Classic.Avalonia.Theme"
                     xmlns:common="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
+                    xmlns:utils="clr-namespace:Classic.Avalonia.Theme.Utils"
                     x:ClassModifier="internal">
   <ControlTheme x:Key="{x:Type MenuFlyoutPresenter}"
                 TargetType="MenuFlyoutPresenter">
@@ -15,7 +16,7 @@
                                       BorderBrush="{x:Static classic:ClassicBorderDecorator.ClassicBorderBrush}"
                                       RenderOptions.EdgeMode="Aliased"
                                       RenderOptions.BitmapInterpolationMode="None"
-                                      RenderOptions.TextRenderingMode="Alias"
+                                      utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}"
                                       BorderThickness="2">
           <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
                         Theme="{StaticResource SimpleMenuScrollViewer}"

diff --git a/src/Classic.Avalonia.Theme/Styles/MenuItem.axaml b/src/Classic.Avalonia.Theme/Styles/MenuItem.axaml
@@ -4,6 +4,7 @@
                     xmlns:sys="using:System"
                     xmlns:classic="clr-namespace:Classic.Avalonia.Theme"
                     xmlns:common="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
+                    xmlns:utils="clr-namespace:Classic.Avalonia.Theme.Utils"
                     x:ClassModifier="internal">
   <conv:PlatformKeyGestureConverter x:Key="KeyGestureConverter" />
 
@@ -20,7 +21,7 @@
                 BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
                 CornerRadius="{TemplateBinding CornerRadius}"
-                RenderOptions.TextRenderingMode="Alias">
+                utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}">
           <Grid>
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="19" />
@@ -86,7 +87,6 @@
                   <ItemsPresenter Name="PART_ItemsPresenter"
                                   Margin="1"
                                   Grid.IsSharedSizeScope="True"
-                                  RenderOptions.TextRenderingMode="Alias"
                                   ItemsPanel="{TemplateBinding ItemsPanel}" />
                 </ScrollViewer>
               </classic:ClassicBorderDecorator>

diff --git a/src/Classic.Avalonia.Theme/Styles/TimePicker.axaml b/src/Classic.Avalonia.Theme/Styles/TimePicker.axaml
@@ -3,6 +3,7 @@
                     xmlns:sys="using:System"
                     xmlns:classic="clr-namespace:Classic.Avalonia.Theme"
                     xmlns:common="clr-namespace:Classic.CommonControls;assembly=Classic.CommonControls.Avalonia"
+                    xmlns:utils="clr-namespace:Classic.Avalonia.Theme.Utils"
                     x:ClassModifier="internal">
   <Design.PreviewWith>
     <Border Padding="20">
@@ -201,7 +202,7 @@
                        Placement="Bottom"
                        PlacementTarget="{TemplateBinding}"
                        WindowManagerAddShadowHint="False">
-                  <TimePickerPresenter Name="PART_PickerPresenter" RenderOptions.TextRenderingMode="Alias" />
+                  <TimePickerPresenter Name="PART_PickerPresenter" utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}" />
                 </Popup>
               </Grid>
             </classic:ClassicBorderDecorator>

diff --git a/src/Classic.Avalonia.Theme/Styles/ToolTip.axaml b/src/Classic.Avalonia.Theme/Styles/ToolTip.axaml
@@ -37,7 +37,6 @@
                           ContentTemplate="{TemplateBinding ContentTemplate}"
                           RenderOptions.EdgeMode="Aliased"
                           RenderOptions.BitmapInterpolationMode="None"
-                          RenderOptions.TextRenderingMode="Alias"
                           CornerRadius="{TemplateBinding CornerRadius}" />
       </ControlTemplate>
     </Setter>

diff --git a/src/Classic.Avalonia.Theme/Styles/Window.axaml b/src/Classic.Avalonia.Theme/Styles/Window.axaml
@@ -26,7 +26,7 @@
       <ControlTemplate>
         <Panel RenderOptions.EdgeMode="Aliased"
                RenderOptions.BitmapInterpolationMode="None"
-               RenderOptions.TextRenderingMode="Alias">
+               utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}">
           <Border Name="PART_TransparencyFallback"
                   IsHitTestVisible="False"
                   Margin="2" />
@@ -88,7 +88,7 @@
       <ControlTemplate>
         <Panel RenderOptions.EdgeMode="Aliased"
                RenderOptions.BitmapInterpolationMode="None"
-               RenderOptions.TextRenderingMode="Alias">
+               utils:FontUtils.FontAliasing="{DynamicResource {x:Static common:SystemParameters.FontAliasingKey}}">
           <Border Name="PART_TransparencyFallback"
                   IsHitTestVisible="False" />
           <Border Background="{TemplateBinding Background}"

diff --git a/src/Classic.Avalonia.Theme/Utils/FontUtils.cs b/src/Classic.Avalonia.Theme/Utils/FontUtils.cs
@@ -0,0 +1,22 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Media;
+
+namespace Classic.Avalonia.Theme.Utils;
+
+internal class FontUtils
+{
+    public static readonly AttachedProperty<bool?> FontAliasingProperty = AvaloniaProperty.RegisterAttached<FontUtils, Control, bool?>("FontAliasing");
+
+    public static bool? GetFontAliasing(AvaloniaObject element) => element.GetValue(FontAliasingProperty);
+
+    public static void SetFontAliasing(AvaloniaObject element, bool? value) => element.SetValue(FontAliasingProperty, value);
+
+    static FontUtils()
+    {
+        FontAliasingProperty.Changed.AddClassHandler<Control>((c, e) =>
+        {
+            RenderOptions.SetTextRenderingMode(c, e.GetNewValue<bool?>() is true ? TextRenderingMode.Alias : TextRenderingMode.SubpixelAntialias);
+        });
+    }
+}
diff --git a/src/Classic.CommonControls.Avalonia/SystemParameters.cs b/src/Classic.CommonControls.Avalonia/SystemParameters.cs
@@ -121,4 +121,7 @@ public static class SystemParameters
     public static SystemResourceKey MenuPopupAnimationKey { get; } = new(SystemResourceKeyID.MenuPopupAnimation);
     public static SystemResourceKey ToolTipPopupAnimationKey { get; } = new(SystemResourceKeyID.ToolTipPopupAnimation);
     public static SystemResourceKey PowerLineStatusKey { get; } = new(SystemResourceKeyID.PowerLineStatus);
+
+    // Classic.Avalonia Custom
+    public static SystemResourceKey FontAliasingKey { get; } = new(SystemResourceKeyID.FontAliasing);
 }
diff --git a/src/Classic.CommonControls.Avalonia/SystemResourceKey.cs b/src/Classic.CommonControls.Avalonia/SystemResourceKey.cs
@@ -261,7 +261,10 @@ internal enum SystemResourceKeyID
     InactiveSelectionHighlightBrush,
     InactiveSelectionHighlightTextBrush,
 
-    InternalSystemColorsExtendedEnd
+    InternalSystemColorsExtendedEnd,
+
+    // Classic.Avalonia Custom
+    FontAliasing
 }
 
 public class SystemResourceKey