テキストの描画品質を改善

b-editor · Feb 7, 2024 · 08b8bd4 · 08b8bd4
1 parent 73b0a59
commit 08b8bd4
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 23 deletions.
diff --git a/src/Beutl.Engine/Graphics/BrushConstructor.cs b/src/Beutl.Engine/Graphics/BrushConstructor.cs
@@ -22,6 +22,9 @@ public void ConfigurePaint(SKPaint paint)
         float opacity = (Brush?.Opacity ?? 0) / 100f;
         paint.IsAntialias = true;
         paint.BlendMode = (SKBlendMode)BlendMode;
+        paint.HintingLevel = SKPaintHinting.Full;
+        paint.LcdRenderText = true;
+        paint.SubpixelText = true;
 
         paint.Color = new SKColor(255, 255, 255, (byte)(255 * opacity));
 

diff --git a/src/Beutl.Engine/Graphics/ImmediateCanvas.cs b/src/Beutl.Engine/Graphics/ImmediateCanvas.cs
@@ -379,22 +379,20 @@ public void DrawText(FormattedText text, IBrush? fill, IPen? pen)
     {
         VerifyAccess();
 
-        var typeface = new Typeface(text.Font, text.Style, text.Weight);
-        SKTypeface sktypeface = typeface.ToSkia();
-        _sharedFillPaint.Reset();
-        _sharedFillPaint.TextSize = text.Size;
-        _sharedFillPaint.Typeface = sktypeface;
+        using SKFont font = text.ToSKFont();
 
-        using var shaper = new SKShaper(sktypeface);
+        using var shaper = new SKShaper(font.Typeface);
         using var buffer = new HarfBuzzSharp.Buffer();
         buffer.AddUtf16(text.Text.AsSpan());
         buffer.GuessSegmentProperties();
 
+        _sharedFillPaint.Reset();
+        _sharedFillPaint.TextSize = text.Size;
+        _sharedFillPaint.Typeface = font.Typeface;
         SKShaper.Result result = shaper.Shape(buffer, _sharedFillPaint);
 
         // create the text blob
         using var builder = new SKTextBlobBuilder();
-        using SKFont font = _sharedFillPaint.ToFont();
         SKPositionedRunBuffer run = builder.AllocatePositionedRun(font, result.Codepoints.Length);
 
         // copy the glyphs

diff --git a/src/Beutl.Engine/Media/Font/FontExtensions.cs b/src/Beutl.Engine/Media/Font/FontExtensions.cs
@@ -1,4 +1,5 @@
 using Beutl.Graphics;
+using Beutl.Media.TextFormatting;
 
 using SkiaSharp;
 
@@ -11,6 +12,19 @@ public static SKTypeface ToSkia(this Typeface typeface)
         return FontManager.Instance._fonts[typeface.FontFamily].Get(typeface);
     }
 
+    public static SKFont ToSKFont(this FormattedText text)
+    {
+        var typeface = new Typeface(text.Font, text.Style, text.Weight);
+        var font = new SKFont(typeface.ToSkia(), text.Size)
+        {
+            Edging = SKFontEdging.Antialias,
+            Subpixel = true,
+            Hinting = SKFontHinting.Full
+        };
+
+        return font;
+    }
+
     public static Typeface ToTypeface(this SKTypeface typeface)
     {
         return new Typeface(new FontFamily(typeface.FamilyName), typeface.FontSlant.ToFontStyle(), (FontWeight)typeface.FontWeight);

diff --git a/src/Beutl.Engine/Media/TextFormatting/FormattedText.cs b/src/Beutl.Engine/Media/TextFormatting/FormattedText.cs
@@ -83,23 +83,22 @@ public StringSpan Text
 
     internal Point AddToSKPath(SKPath path, Point point)
     {
-        SKTypeface typeface = new Typeface(Font, Style, Weight).ToSkia();
-        using SKPaint paint = new()
-        {
-            TextSize = Size,
-            Typeface = typeface
-        };
+        using SKFont font = this.ToSKFont();
 
-        using var shaper = new SKShaper(typeface);
+        using var shaper = new SKShaper(font.Typeface);
         using var buffer = new HarfBuzzSharp.Buffer();
         buffer.AddUtf16(Text.AsSpan());
         buffer.GuessSegmentProperties();
 
+        using SKPaint paint = new()
+        {
+            TextSize = Size,
+            Typeface = font.Typeface
+        };
         SKShaper.Result result = shaper.Shape(buffer, paint);
 
         // create the text blob
         using var builder = new SKTextBlobBuilder();
-        using SKFont font = paint.ToFont();
         SKPositionedRunBuffer run = builder.AllocatePositionedRun(font, result.Codepoints.Length);
 
         // copy the glyphs
@@ -130,21 +129,21 @@ internal Point AddToSKPath(SKPath path, Point point)
 
     private (FontMetrics, Size) Measure()
     {
-        SKTypeface typeface = new Typeface(Font, Style, Weight).ToSkia();
-        using SKPaint paint = new()
-        {
-            TextSize = Size,
-            Typeface = typeface
-        };
+        using SKFont font = this.ToSKFont();
 
-        using var shaper = new SKShaper(typeface);
+        using var shaper = new SKShaper(font.Typeface);
         using var buffer = new HarfBuzzSharp.Buffer();
         buffer.AddUtf16(Text.AsSpan());
         buffer.GuessSegmentProperties();
 
+        using SKPaint paint = new()
+        {
+            TextSize = Size,
+            Typeface = font.Typeface
+        };
         SKShaper.Result result = shaper.Shape(buffer, paint);
 
-        FontMetrics fontMetrics = paint.FontMetrics.ToFontMetrics();
+        FontMetrics fontMetrics = font.Metrics.ToFontMetrics();
         float w = result.Width;
         var size = new Size(
             w + (buffer.Length - 1) * Spacing,