refactor(Studio): Setup editor-rendering with Skia

EverestAPI · Oct 26, 2024 · be58a60 · be58a60
1 parent 904deb7
commit be58a60
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 9 deletions.
diff --git a/Studio/CelesteStudio.GTK/CelesteStudio.GTK.csproj b/Studio/CelesteStudio.GTK/CelesteStudio.GTK.csproj
@@ -20,6 +20,8 @@
 
         <!-- Use a CI-build, since that contains a fix for some issues -->
         <PackageReference Include="Eto.Platform.Gtk" Version="2.8.4-ci-20240710.9879198421" />
+
+        <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.80.3" />
     </ItemGroup>
 
 </Project>
diff --git a/Studio/CelesteStudio.Mac/CelesteStudio.Mac.csproj b/Studio/CelesteStudio.Mac/CelesteStudio.Mac.csproj
@@ -21,6 +21,8 @@
 
         <!-- Use an CI-build, since it contains a fix for using context menu hotkeys inside the editor -->
         <PackageReference Include="Eto.Platform.Mac64" Version="2.8.4-ci-20240710.9879198421" />
+
+        <PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="2.80.3" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Studio/CelesteStudio.WPF/CelesteStudio.WPF.csproj b/Studio/CelesteStudio.WPF/CelesteStudio.WPF.csproj
@@ -20,6 +20,8 @@
         <ProjectReference Include="..\CelesteStudio\CelesteStudio.csproj"/>
         <PackageReference Include="Eto.Platform.Wpf" Version="2.8.3"/>
         <PackageReference Include="DarkNet" Version="2.3.0" />
+
+        <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="2.80.3" />
     </ItemGroup>
 
 </Project>
diff --git a/Studio/CelesteStudio/CelesteStudio.csproj b/Studio/CelesteStudio/CelesteStudio.csproj
@@ -22,12 +22,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Eto.Forms" Version="2.8.3" />
-        <PackageReference Include="Samboy063.Tomlet" Version="5.3.1" />
-        <PackageReference Include="Markdig" Version="0.37.0" />
+        <PackageReference Include="Eto.Forms" Version="2.8.3"/>
+        <PackageReference Include="Eto.SkiaDraw" Version="0.2.0"/>
 
-        <ProjectReference Include="..\..\StudioCommunication\StudioCommunication.csproj" />
-        <ProjectReference Include="..\..\external\Featherline\Featherline.csproj" />
+        <PackageReference Include="Samboy063.Tomlet" Version="5.3.1"/>
+        <PackageReference Include="Markdig" Version="0.37.0"/>
+
+        <ProjectReference Include="..\..\StudioCommunication\StudioCommunication.csproj"/>
+        <ProjectReference Include="..\..\external\Featherline\Featherline.csproj"/>
     </ItemGroup>
 
     <ItemGroup>

diff --git a/Studio/CelesteStudio/Editing/Editor.cs b/Studio/CelesteStudio/Editing/Editor.cs
@@ -13,14 +13,16 @@
 using CelesteStudio.Util;
 using Eto.Drawing;
 using Eto.Forms;
+using Eto.SkiaDraw;
+using SkiaSharp;
 using StudioCommunication;
 using StudioCommunication.Util;
 using WrapLine = (string Line, int Index);
 using WrapEntry = (int StartOffset, (string Line, int Index)[] Lines);
 
 namespace CelesteStudio.Editing;
 
-public sealed class Editor : Drawable {
+public sealed class Editor : SkiaDrawable {
     /// Reports insertions and deletions of the underlying document
     public event Action<Document, Dictionary<int, string>, Dictionary<int, string>> TextChanged = (_, _, _) => {};
 
@@ -3618,10 +3620,13 @@ private void UpdateMouseCursor(PointF location, Keys modifiers) {
 
     #region Drawing
 
-    protected override void OnPaint(PaintEventArgs e) {
-        // Doing this in Recalc() seems to cause issues for some reason, but it needs to happen regularly
-        //Studio.Instance.GameInfoPanel.UpdateGameInfo();
+    protected override void OnPaint(SKPaintEventArgs e) {
+        e.Surface.Canvas.Clear();
 
+        var font = FontManager.SKEditorFontRegular;
+        e.Surface.Canvas.DrawText("Hello World", 10.0f, 10.0f, font, new SKPaint { Color = SKColors.Aqua, IsAntialias = true });
+
+        /*
         e.Graphics.AntiAlias = true;
 
         // To be reused below. Kinda annoying how C# handles out parameter conflicts
@@ -3896,6 +3901,7 @@ protected override void OnPaint(PaintEventArgs e) {
         }
 
         base.OnPaint(e);
+        */
     }
 
     #endregion

diff --git a/Studio/CelesteStudio/FontManager.cs b/Studio/CelesteStudio/FontManager.cs
@@ -3,6 +3,8 @@
 using System.Linq;
 using System.Reflection;
 using Eto.Drawing;
+using SkiaSharp;
+using System;
 
 namespace CelesteStudio;
 
@@ -15,6 +17,7 @@ public static class FontManager {
 #endif
 
     private static Font? editorFontRegular, editorFontBold, editorFontItalic, editorFontBoldItalic, statusFont, popupFont;
+    private static SKFont? skEditorFontRegular;
 
     public static Font EditorFontRegular    => editorFontRegular    ??= CreateEditor(FontStyle.None);
     public static Font EditorFontBold       => editorFontBold       ??= CreateEditor(FontStyle.Bold);
@@ -23,6 +26,8 @@ public static class FontManager {
     public static Font StatusFont           => statusFont           ??= CreateStatus();
     public static Font PopupFont            => popupFont            ??= CreatePopup();
 
+    public static SKFont SKEditorFontRegular => skEditorFontRegular ??= CreateSKFont(Settings.Instance.FontFamily, Settings.Instance.EditorFontSize * Settings.Instance.FontZoom);
+
     private static FontFamily? builtinFontFamily;
     public static Font CreateFont(string fontFamily, float size, FontStyle style = FontStyle.None) {
         if (Platform.Instance.IsMac && fontFamily == FontFamilyBuiltin) {
@@ -42,6 +47,20 @@ public static Font CreateFont(string fontFamily, float size, FontStyle style = F
         }
     }
 
+    public static SKFont CreateSKFont(string fontFamily, float size) {
+        if (Platform.Instance.IsMac && fontFamily == FontFamilyBuiltin) {
+            // The built-in font is broken on macOS for some reason, so fallback to a system font
+            fontFamily = "Monaco";
+        }
+
+        if (fontFamily == FontFamilyBuiltin) {
+            using var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("JetBrainsMono/JetBrainsMono-Regular");
+            return new SKFont(SKTypeface.FromStream(stream), size);
+        } else {
+            return new SKFont(SKTypeface.FromFamilyName(fontFamily), size);
+        }
+    }
+
     private static readonly Dictionary<Font, float> charWidthCache = new();
     public static float CharWidth(this Font font) {
         if (charWidthCache.TryGetValue(font, out float width)) {
@@ -79,6 +98,10 @@ public static void OnFontChanged() {
         charWidthCache.Clear();
 
         editorFontRegular = editorFontBold = editorFontItalic = editorFontBoldItalic = statusFont = popupFont = null;
+
+        skEditorFontRegular?.Dispose();
+
+        skEditorFontRegular = null;
     }
 
     private static Font CreateEditor(FontStyle style) => CreateFont(Settings.Instance.FontFamily, Settings.Instance.EditorFontSize * Settings.Instance.FontZoom, style);