fonts can be loaded from windows

Author: FlurinBruehwiler

Flamui/Drawing/FontLoader.cs

@@ -220,12 +220,7 @@ public class FontLoader
 {
     public static unsafe Font LoadFont(string name)
     {
-        var asm = Assembly.GetExecutingAssembly();
-
-        using var stream = asm.GetManifestResourceStream($"Flamui.Drawing.{name}");
-        using MemoryStream ms = new MemoryStream();
-        stream!.CopyTo(ms);
-        var fontData = ms.ToArray();
+        var fontData = GetFont(name);
 
         // Console.WriteLine($"Allocating {((float)fontData.Length)/1000/1000} MB");
         var ptr = Marshal.AllocHGlobal(fontData.Length); //todo maybe also free again????
@@ -252,6 +247,22 @@ public static unsafe Font LoadFont(string name)
         };
     }
 
+    private static byte[] GetFont(string fileName)
+    {
+        var windowsFontLocation = Path.Combine(@"C:\Windows\Fonts\", fileName);
+        if (File.Exists(windowsFontLocation))
+        {
+            return File.ReadAllBytes(windowsFontLocation);
+        }
+
+        var asm = Assembly.GetExecutingAssembly();
+
+        using var stream = asm.GetManifestResourceStream($"Flamui.Drawing.{fileName}");
+        using MemoryStream ms = new MemoryStream();
+        stream!.CopyTo(ms);
+        return ms.ToArray();
+    }
+
     public static FontAtlas CreateFontAtlas(ScaledFont scaledFont)
     {
         var table = new LRUCache<GlyphCacheHash, AtlasGlyphInfo>(10*10);

Flamui/Drawing/GlCanvas.cs

@@ -46,6 +46,7 @@ public void DrawText(ReadOnlySpan<char> text, float x, float y)
             // Console.WriteLine($"{c}: {fontAtlas.Font.Ascent}: {glyphInfo.YOff}, {glyphInfo.AtlasHeight}, {glyphInfo.Height}");
             DrawGlyph(fontAtlas, glyphInfo, fontAtlas.GpuTexture, xCoord + glyphInfo.LeftSideBearing, y + fontAtlas.Font.Ascent + glyphInfo.YOff);
             xCoord += glyphInfo.AdvanceWidth;
+            Console.WriteLine($"Metrics: {c}:{glyphInfo.AdvanceWidth}:{glyphInfo.LeftSideBearing}");
         }
     }
     //an

Flamui/Ui.cs

@@ -149,7 +149,7 @@ public void ResetStuff()
 
         CascadingStack.Clear();
         CascadingValues = new CascadingStuff();
-        CascadingValues.Font = FontManager.GetFont("JetBrainsMono-Regular.ttf");
+        CascadingValues.Font = FontManager.GetFont("segoeui.ttf");
         CascadingValues.TextColor = C.Black;
         CascadingValues.TextSize = 15;
 

Sample.LayoutTest/Program.cs

@@ -3,10 +3,8 @@
 
 /*
  * Todo
- * - non ascii text
  * - Scroll
  * - Fix Border
- * - Only rerender when changed
  */
 
 var builder = FlamuiApp.CreateBuilder();
@@ -42,6 +40,11 @@ public override void Build(Ui ui)
                 {
                     ui.StyledInput(ref input2);
 
+                    if (ui.Button("New Window", primary: true))
+                    {
+                        app.CreateWindow<LayoutTest>("Anoter Window");
+                    }
+
                     // var dropdown = ui.CreateDropDown(selectedOption);
                     // dropdown.Component.Option("Hi");
                     // dropdown.Component.Option("Anita");