use harfbuzz for text rendering

fmbot-discord · Nov 28, 2024 · 28c58c1 · 28c58c1
1 parent 0cef06d
commit 28c58c1
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/src/FMBot.Bot/FMBot.Bot.csproj b/src/FMBot.Bot/FMBot.Bot.csproj
@@ -64,6 +64,7 @@
     <PackageReference Include="Serilog.Sinks.Discord" Version="1.2.1" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
     <PackageReference Include="SkiaSharp" Version="2.88.8" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.8" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
     <PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.88.8" />
     <PackageReference Include="SpotifyAPI.Web" Version="7.1.1" />

diff --git a/src/FMBot.Bot/Models/ChartModels.cs b/src/FMBot.Bot/Models/ChartModels.cs
@@ -2,6 +2,7 @@
 using Discord;
 using FMBot.Domain.Models;
 using SkiaSharp;
+
 using Color = System.Drawing.Color;
 
 namespace FMBot.Bot.Models;

diff --git a/src/FMBot.Bot/Services/ChartService.cs b/src/FMBot.Bot/Services/ChartService.cs
@@ -12,6 +12,7 @@
 using FMBot.Domain.Models;
 using Serilog;
 using SkiaSharp;
+using SkiaSharp.HarfBuzz;
 using Color = System.Drawing.Color;
 
 namespace FMBot.Bot.Services;
@@ -525,14 +526,14 @@ private void AddTitleToChartImage(SKBitmap chartImage, bool largerImages, TopAlb
 
         bitmapCanvas.DrawRoundRect(backgroundRectangle, 4, 4, rectanglePaint);
 
-        bitmapCanvas.DrawText(artistName, (float)chartImage.Width / 2,
+        bitmapCanvas.DrawShapedText(artistName, (float)chartImage.Width / 2,
             -artistBounds.Top + chartImage.Height -
             (albumName != null ? largerImages ? 39 : 26 : largerImages ? 20 : 13),
             textPaint);
 
         if (albumName != null)
         {
-            bitmapCanvas.DrawText(albumName, (float)chartImage.Width / 2,
+            bitmapCanvas.DrawShapedText(albumName, (float)chartImage.Width / 2,
                 -albumBounds.Top + chartImage.Height - (largerImages ? 20 : 13),
                 textPaint);
         }
@@ -559,8 +560,8 @@ private static void AddClassicTitleToChartImage(SKBitmap chartImage, TopAlbum al
         textPaint.MeasureText(album.ArtistName, ref artistBounds);
         textPaint.MeasureText(album.AlbumName, ref albumBounds);
 
-        bitmapCanvas.DrawText(album.ArtistName, 4, 12, textPaint);
-        bitmapCanvas.DrawText(album.AlbumName, 4, 22, textPaint);
+        bitmapCanvas.DrawShapedText(album.ArtistName, 4, 12, textPaint);
+        bitmapCanvas.DrawShapedText(album.AlbumName, 4, 22, textPaint);
     }
 
     public ChartSettings SetSettings(ChartSettings currentChartSettings, string[] extraOptions,

diff --git a/src/FMBot.Images/FMBot.Images.csproj b/src/FMBot.Images/FMBot.Images.csproj
@@ -20,6 +20,7 @@
     <PackageReference Include="SkiaSharp" Version="2.88.8" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.8" />
     <PackageReference Include="SkiaSharp.Views.Desktop.Common" Version="2.88.8" />
+    <PackageReference Include="SkiaSharp.HarfBuzz" Version="2.88.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/FMBot.Images/Generators/PuppeteerService.cs b/src/FMBot.Images/Generators/PuppeteerService.cs
@@ -6,6 +6,7 @@
 using PuppeteerSharp;
 using Serilog;
 using SkiaSharp;
+using SkiaSharp.HarfBuzz;
 
 namespace FMBot.Images.Generators;
 
@@ -585,7 +586,7 @@ private static void AddCountryListToMap(SKBitmap chartImage, List<GroupedCountri
 
         bitmapCanvas.DrawRoundRect(backgroundRectangle, 12, 12, rectanglePaint);
 
-        bitmapCanvas.DrawText($"Artists per country", rectangleLeft + 170, rectangleTop + 58, textPaint);
+        bitmapCanvas.DrawShapedText($"Artists per country", rectangleLeft + 170, rectangleTop + 58, textPaint);
 
         for (var index = 0; index < lines.Count; index++)
         {
@@ -608,12 +609,12 @@ private static void AddCountryListToMap(SKBitmap chartImage, List<GroupedCountri
             bitmapCanvas.DrawRoundRect(colorRectangle, 8, 8, colorRectanglePaint);
 
             var text = line.MinAmount == line.MaxAmount ? $"{line.MinAmount}" : $"{line.MinAmount} - {line.MaxAmount}";
-            bitmapCanvas.DrawText(text, rectangleLeft + 200, rectangleTop + 129 + (index * 65), textPaint);
+            bitmapCanvas.DrawShapedText(text, rectangleLeft + 200, rectangleTop + 129 + (index * 65), textPaint);
         }
 
-        bitmapCanvas.DrawText($"{lines.SelectMany(s => s.CountryCodes).Count()} countries", rectangleLeft + 170,
+        bitmapCanvas.DrawShapedText($"{lines.SelectMany(s => s.CountryCodes).Count()} countries", rectangleLeft + 170,
             rectangleTop + 140 + ((lines.Count) * lineHeight), textPaint);
-        bitmapCanvas.DrawText($"Generated by .fmbot", rectangleLeft + 170,
+        bitmapCanvas.DrawShapedText($"Generated by .fmbot", rectangleLeft + 170,
             rectangleTop + 170 + ((lines.Count) * lineHeight), promoTextPaint);
     }
 
@@ -676,13 +677,13 @@ public void CreatePopularityIcebergImage(SKBitmap chartImage, string username, s
             Typeface = typeface
         };
 
-        bitmapCanvas.DrawText($"{username}'s", 590, 198, titlePaint);
+        bitmapCanvas.DrawShapedText($"{username}'s", 590, 198, titlePaint);
 
         titlePaint.TextSize = 60;
-        bitmapCanvas.DrawText($"iceberg", 830, 262, titlePaint);
+        bitmapCanvas.DrawShapedText($"iceberg", 830, 262, titlePaint);
 
         titlePaint.TextSize = 42;
-        bitmapCanvas.DrawText(timePeriod, 980, 415, titlePaint);
+        bitmapCanvas.DrawShapedText(timePeriod, 980, 415, titlePaint);
 
         using var artistTextPaint = new SKPaint
         {
@@ -736,10 +737,10 @@ public void CreatePopularityIcebergImage(SKBitmap chartImage, string username, s
                     artistTextPaint.Color = SKColors.White;
                     artistStrokePaint.Color = SKColors.Black;
 
-                    bitmapCanvas.DrawText(sectionArtists[i].Name, position.X, position.Y, artistStrokePaint);
+                    bitmapCanvas.DrawShapedText(sectionArtists[i].Name, position.X, position.Y, artistStrokePaint);
                 }
 
-                bitmapCanvas.DrawText(sectionArtists[i].Name, position.X, position.Y, artistTextPaint);
+                bitmapCanvas.DrawShapedText(sectionArtists[i].Name, position.X, position.Y, artistTextPaint);
             }
         }
     }