arena string improvements

Author: FlurinBruehwiler

Flamui/ArenaList.cs

@@ -29,24 +29,29 @@ public ArenaList(Arena arena, int initialCapacity = 1)
         _backingSliceAllocateNum = arena.AllocNum;
     }
 
-    public unsafe void Add(T value)
+    public void AddRange(ReadOnlySpan<T> values)
     {
-        var arena = Ui.Arena;
+        EnsureInit();
+        ResizeIfNeeded(Count + values.Length);
+        values.CopyTo(_backingSlice.Span.Slice(Count));
+        Count += values.Length;
+    }
 
-        if (_arenaHash == 0)
-            _arenaHash = arena.GetHashCode();
+    public void Add(T value)
+    {
+        EnsureInit();
 
-        Debug.Assert(arena.GetHashCode() == _arenaHash);
+        ResizeIfNeeded(Count);
 
-        if (Capacity == 0) //in case the ArenaList isn't initialized via the constructor
-        {
-            _backingSlice = arena.AllocateSlice<T>(1);
-            _backingSliceAllocateNum = arena.AllocNum;
-        }
+        _backingSlice[Count] = value;
+        Count++;
+    }
 
-        Debug.Assert(Count <= Capacity);
+    private unsafe void ResizeIfNeeded(int neededCapacity)
+    {
+        var arena = Ui.Arena;
 
-        if (Count == Capacity)
+        if (neededCapacity >= Capacity)
         {
             //if there hasn't been another allocation on the arena, we don't need to allocate a new slice, we can just "extend" the current one
 
@@ -62,14 +67,11 @@ public unsafe void Add(T value)
             {
                 var newSlice = arena.AllocateSlice<T>(Capacity * 2);
                 _backingSliceAllocateNum = arena.AllocNum;
-                
+
                 _backingSlice.Span.CopyTo(newSlice.Span);
                 _backingSlice = newSlice;
             }
         }
-
-        _backingSlice[Count] = value;
-        Count++;
     }
 
     public ref T this[int index]
@@ -103,6 +105,23 @@ public Enumerator GetEnumerator()
         return new Enumerator(this);
     }
 
+    private void EnsureInit()
+    {
+        var arena = Ui.Arena;
+
+        if (_arenaHash == 0)
+            _arenaHash = arena.GetHashCode();
+
+        Debug.Assert(arena.GetHashCode() == _arenaHash);
+
+        if (Capacity == 0) //in case the ArenaList isn't initialized via the constructor
+        {
+            _backingSlice = arena.AllocateSlice<T>(1);
+            _backingSliceAllocateNum = arena.AllocNum;
+        }
+        Debug.Assert(Count <= Capacity);
+    }
+
     IEnumerator<T> IEnumerable<T>.GetEnumerator()
     {
         return GetEnumerator();

Flamui/ArenaString.cs

@@ -5,29 +5,29 @@ namespace Flamui;
 
 public struct ArenaStringBuilder
 {
-    private readonly Arena _arena;
+    public ArenaList<char> _backingList;
 
     public ArenaStringBuilder(Arena arena, int capacity)
     {
-        _arena = arena;
+        _backingList = new ArenaList<char>(arena, capacity);
     }
 
     public void Add(ArenaString arenaString)
     {
-
+        _backingList.AddRange(arenaString.AsSpan());
     }
 
     public void Add<T>(T val)
     {
-        if (val is int i) {
-            i.ToArenaString();
-        }
-        else if (val is bool b) {
-            b.ToArenaString();
-        }
-        else if (val is char c) {
-            c.ToArenaString();
-        }
+        var arenaString = val switch
+        {
+            int i => i.ToArenaString(),
+            bool b => b.ToArenaString(),
+            char c => c.ToArenaString(),
+            string s => s,
+            _ => throw new Exception($"{typeof(T)} is currently not supported :(")
+        };
+        Add(arenaString);
     }
 
     public ArenaString Build()
@@ -85,7 +85,7 @@ public static unsafe ArenaString ToArenaString(this char i)
 [InterpolatedStringHandler]
 public struct ArenaString : IEquatable<ArenaString> //todo implement IEnumerable
 {
-    // private ArenaStringBuilder _arenaStringBuilder;
+    private ArenaStringBuilder _arenaStringBuilder;
     private Slice<char> _slice;
 
     public int Length => _slice.Length;
@@ -137,20 +137,23 @@ public override string ToString()
         return AsSpan().ToString();
     }
 
-    // public ArenaString(int literalLength, int formattedCount)
-    // {
-    //     _arenaStringBuilder = new ArenaStringBuilder(Ui.Arena, literalLength);
-    // }
-    //
-    // public void AppendLiteral(string s)
-    // {
-    //     _arenaStringBuilder.Add((ArenaString)s);
-    // }
-    //
-    // public void AppendFormatted<T>(T t)
-    // {
-    //     _arenaStringBuilder.Add(t);
-    // }
+    public ArenaString(int literalLength, int formattedCount)
+    {
+        _arenaStringBuilder = new ArenaStringBuilder(Ui.Arena, literalLength);
+    }
+
+    public void AppendLiteral(string s)
+    {
+        _arenaStringBuilder.Add((ArenaString)s);
+        _slice = _arenaStringBuilder._backingList.AsSlice();
+    }
+
+    public void AppendFormatted<T>(T t)
+    {
+        _arenaStringBuilder.Add(t);
+        _slice = _arenaStringBuilder._backingList.AsSlice();
+    }
+
     public bool Equals(ArenaString other)
     {
         return other.AsSpan().SequenceEqual(AsSpan());

Flamui/Ui.cs

@@ -84,7 +84,7 @@ public FlexContainer Div(
         return div;
     }
 
-    public UiText Text(string content,
+    public UiText Text(ArenaString content,
         string key = "",
         [CallerFilePath] string path = "",
         [CallerLineNumber] int line = -1)
@@ -106,7 +106,7 @@ public UiText Text(string content,
         return text;
     }
 
-    public UiSvg SvgImage(string src, ColorDefinition? colorDefinition = null,
+    public UiSvg SvgImage(ArenaString src, ColorDefinition? colorDefinition = null,
         string key = "",
         [CallerFilePath] string path = "",
         [CallerLineNumber] int line = -1)

Flamui/UiElements/UiSvg.cs

@@ -1,5 +1,4 @@
-using System.Numerics;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using Flamui.Drawing;
 using Flamui.Layouting;
 using Point = Flamui.Layouting.Point;
@@ -9,9 +8,9 @@ namespace Flamui.UiElements;
 //Todo, we should probably offload svg loading onto a separate thread, or do them async etc., or maybe preload them
 public class UiSvg : UiElement
 {
-    public string Src { get; set; } = null!;
+    public ArenaString Src { get; set; } = default;
     public ColorDefinition? ColorDefinition { get; set; }
-    private static readonly Dictionary<string, (Slice<byte>, float aspectRatio)> SSvgCache = new();
+    private static readonly Dictionary<int, (Slice<byte>, float aspectRatio)> SSvgCache = new();
 
     public override void Render(RenderContext renderContext, Point offset)
     {
@@ -51,9 +50,9 @@ public override BoxSize Layout(BoxConstraint constraint)
 
     private unsafe (Slice<byte>, float aspectRatio) GetBitmap()
     {
-        if (!SSvgCache.TryGetValue(Src, out var entry))
+        if (!SSvgCache.TryGetValue(Src.GetHashCode(), out var entry))
         {
-            var bytes = File.ReadAllBytes(Src);
+            var bytes = File.ReadAllBytes(Src.ToString());
 
             var (width, height) = TinyVG.ParseHeader(bytes);
 
@@ -62,7 +61,7 @@ private unsafe (Slice<byte>, float aspectRatio) GetBitmap()
             bytes.AsSpan().CopyTo(dest);
 
             entry = (new Slice<byte>(ptr, bytes.Length), (float)width / (float)height);
-            SSvgCache.Add(Src, entry);
+            SSvgCache.Add(Src.GetHashCode(), entry);
         }
 
         return entry;

Flamui/UiElements/UiText.cs

@@ -17,7 +17,7 @@ public UiTextInfo()
     public TextAlign HorizontalAlignment = TextAlign.Start;
     public TextAlign VerticalAlignment = TextAlign.Center;
     public bool Multiline;
-    public string Content = string.Empty;
+    public ArenaString Content = default;
 }
 
 public struct TextPosition

Sample.LayoutTest/Program.cs

@@ -49,10 +49,11 @@ public class LayoutTest(FlamuiApp app) : FlamuiComponent
 
     public override void Build(Ui ui)
     {
-        using (ui.Div().Margin(10).Color(C.Gray6).ScrollVertical().Clip())
+        using (ui.Div().Margin(10).Color(C.Gray6).ScrollVertical().Clip().Padding(10))
         {
             foreach (var icon in icons)
             {
+                ui.Text(icon, icon).Size(20);
                 using (ui.Div(icon).Width(100).Height(100))
                 {
                     ui.SvgImage($"Icons/TVG/{icon}");