fix bug with iterating chunked list

Author: FlurinBruehwiler

Flamui.Tests/ArenaChunkedListTests.cs

@@ -0,0 +1,21 @@
+namespace Flamui.Test;
+
+public class ArenaChunkedListTests
+{
+    [Fact]
+    public void AddItemsAndIterate()
+    {
+        var arena = new Arena("TestArena", 1_000);
+        var list = new ArenaChunkedList<int>(arena, 5);
+
+        list.Add(1);
+        list.Add(2);
+        list.Add(3);
+        list.Add(4);
+        list.Add(5);
+        list.Add(6);
+        list.Add(7);
+
+        Assert.Equal(Enumerable.Range(1, 7), list);
+    }
+}

Flamui.Tests/LayoutingTests.cs

@@ -16,8 +16,7 @@ public LayoutingTests(ITestOutputHelper console)
     {
         _console = console;
 
-        var virtualBuffer = RenderContext.manager.CreateBuffer("TestArena", (UIntPtr)1_000);
-        Ui.Arena = new Arena(virtualBuffer);
+        Ui.Arena = new Arena("TestArena", 1_000);
     }
 
     public void Dispose()

Flamui.Tests/TextEditTests.cs

@@ -431,8 +431,7 @@ private string ApplyInput(string initialText, Input input)
     {
         var (cursorPosition, selectionStart) = ExtractMetadata(ref initialText);
 
-        var virtualBuffer = RenderContext.manager.CreateBuffer("TestArena", (UIntPtr)1_000);
-        var arena = Ui.Arena = new Arena(virtualBuffer);
+        var arena = Ui.Arena = new Arena("TestArena", 1_000);
 
         var font = FontLoader.LoadFont("segoeui.ttf");
         var layoutInfo = FontShaping.LayoutText(new ScaledFont(font, 20), initialText, float.MaxValue, TextAlign.Start, false, arena);

Flamui/Arena.cs

@@ -36,9 +36,11 @@ public class Arena : IAllocator, IDisposable
 
     private readonly Dictionary<object, GCHandle> objectToHandle = [];
 
-    public Arena(VirtualBuffer virtualBuffer)
+    public static VirtualArenaManager manager = new();
+
+    public Arena(string name, int size)
     {
-        VirtualBuffer = virtualBuffer;
+        VirtualBuffer = manager.CreateBuffer(name, (UIntPtr)size);
     }
 
     /// <summary>

Flamui/ArenaChunkedList.cs

@@ -157,6 +157,7 @@ public bool MoveNext()
                 }
 
                 _currentChunk = _currentChunk->NextChunk;
+                _indexInChunk = 0;
             }
 
             if (_indexInChunk >= _currentChunk->Count)

Flamui/RenderContext.cs

@@ -13,16 +13,13 @@ public class RenderContext
     public RenderContext()
     {
         ZIndexes.Push(0);
-        var virtualBuffer = manager.CreateBuffer("PerFrameArena", (UIntPtr)1_000_000);
-        Arena = new Arena(virtualBuffer);
+        Arena = new Arena("PerFrameArena", 1_000_000);
     }
 
     public Arena Arena;
     public Dictionary<int, ArenaChunkedList<Command>> CommandBuffers = [];
     private Stack<Matrix4X4<float>> MatrixStack = [];
 
-    public static VirtualArenaManager manager = new();
-
     public void Reset()
     {
         CommandBuffers.Clear();
@@ -198,6 +195,12 @@ public void PrintCommands()
                     case CommandType.Matrix:
                         Console.WriteLine($"Matrix: {command.Matrix}");
                         break;
+                    case CommandType.TinyVG:
+                        Console.WriteLine("VG");
+                        break;
+                    case CommandType.Picture:
+                        Console.WriteLine("Picture");
+                        break;
                     default:
                         throw new ArgumentOutOfRangeException(command.Type.ToString());
                 }

Flamui/UiElements/FlexContainerRenderer.cs

@@ -99,7 +99,7 @@ public static void Render(RenderContext renderContext, FlexContainer flexContain
 
         if (flexContainer.Info.ScrollConfigY.CanScroll || flexContainer.Info.ScrollConfigX.CanScroll)
         {
-            renderContext.PopMatrix(); //todo, maybe some kind of push and pop system
+            renderContext.PopMatrix();
 
             flexContainer._scrollBarContainerX.UiElement?.Render(renderContext, offset.Add(flexContainer._scrollBarContainerX.UiElement.ParentData.Position));
             flexContainer._scrollBarContainerY.UiElement?.Render(renderContext, offset.Add(flexContainer._scrollBarContainerY.UiElement.ParentData.Position));

Flamui/UiWindow.cs

@@ -308,7 +308,8 @@ private void RenderToCanvas()
 
         if (!RenderContextAreSame(RenderContext, LastRenderContext))
         {
-            Console.WriteLine("rerender");
+            RenderContext.PrintCommands();
+
             _renderer.Gl.Viewport(Window.Size);
             RenderContext.Rerender(_renderer);
             Window.GLContext.SwapBuffers();

Flamui/VgAtlas.cs

@@ -69,6 +69,8 @@ public unsafe AtlasEntry GetAtlasEntry(int svgHash, Span<byte> vgData, uint widt
             return entry;
         }
 
+        Console.WriteLine("VG cache miss");
+
         entry = Table.GetLeastUsed();
 
         fixed (byte* tvg = vgData)