fix tests

Author: FlurinBruehwiler

Flamui.Tests/LayoutingTests.cs

@@ -1106,7 +1106,7 @@ public void Text_Multiline()
         var expected =
             """
             FlexContainer = X:0, Y:0, W:400, H:100
-                UiText = X:0, Y:0, W:336, H:32
+                UiText = X:0, Y:0, W:241, H:32
                     Line = Lorem ipsum dolor sit amet, consectetur adipiscing elit.
                     Line = Lorem ipsum dolor sit amet, consectetur adipiscing elit.
             """;
@@ -1127,7 +1127,7 @@ public void Text_Wrap()
         var expected =
             """
             FlexContainer = X:0, Y:0, W:200, H:100
-                UiText = X:0, Y:0, W:168, H:32
+                UiText = X:0, Y:0, W:126, H:32
                     Line = Lorem ipsum dolor sit amet, 
                     Line = consectetur adipiscing elit.
             """;
@@ -1149,14 +1149,11 @@ public void Multiple_Text_Sizes()
         var expected =
             """
             FlexContainer = X:0, Y:0, W:400, H:400
-                UiText = X:0, Y:0, W:360, H:42
-                    Line = Lorem ipsum dolor sit amet, consectetur 
-                    Line = adipiscing elit.
-                UiText = X:0, Y:42, W:324, H:164
-                    Line = Lorem ipsum dolor 
-                    Line = sit amet, 
-                    Line = consectetur 
-                    Line = adipiscing elit.
+                UiText = X:0, Y:0, W:336, H:21
+                    Line = Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+                UiText = X:0, Y:21, W:367, H:82
+                    Line = Lorem ipsum dolor sit amet, 
+                    Line = consectetur adipiscing elit.
             """;
 
         AssertUi(ui, 400, 400, expected);

Flamui.Tests/TextEditTests.cs

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

Flamui/Drawing/FontShaping.cs

@@ -50,7 +50,7 @@ public static (float totalWidth, Slice<float> charOffsets) MeasureText(ScaledFon
     //if we can't even fit a single word on a line, we have to start to split in the middle of the word!
     public static TextLayoutInfo LayoutText(ScaledFont scaledFont, ArenaString text, float maxWidth, TextAlign horizontalAlignement, bool multilineAllowed, Arena arena)
     {
-        ArenaList<Line> lines = new ArenaList<Line>(Ui.Arena, 1); //todo, arena allocate
+        ArenaList<Line> lines = new ArenaList<Line>(Ui.Arena, 1);
         float widthOfLongestLine = 0;
 
         int currentBlockStart = 0;

Flamui/Drawing/JetBrainsMono-Regular.ttf

@@ -40,7 +40,6 @@
     </ItemGroup>
 
     <ItemGroup>
-      <EmbeddedResource Include="Drawing\JetBrainsMono-Regular.ttf" />
       <EmbeddedResource Include="Drawing\Shaders\main_fragment.glsl" />
       <EmbeddedResource Include="Drawing\Shaders\main_vertex.glsl" />
     </ItemGroup>

Flamui/Flamui.csproj

@@ -49,7 +49,7 @@ public void CreateWindow<TRootComponent>(string title, FlamuiWindowOptions? opti
         {
             Size = new Vector2D<int>(options.Width, options.Height),
             Title = title,
-            VSync = false, //for some reason this doesn't work on my laptop, so we just sleep ourselves
+            VSync = true, //for some reason this doesn't work on my laptop, so we just sleep ourselves
             ShouldSwapAutomatically = false
         };
 

Flamui/FlamuiApp.cs

@@ -46,7 +46,7 @@ private object GetComponentInternal(Type type, UiID id)
 
     public T GetData<T>(UiID id, Func<Ui, UiID, T> factoryMethod) where T : notnull
     {
-        return GetData(id, 0, (ui, uiId, _) => factoryMethod(ui, uiId));
+        return GetData(id, factoryMethod, static (ui, uiId, f) => f(ui, uiId));
     }
 
     public T GetData<T, TContext>(UiID id, TContext context, Func<Ui, UiID, TContext, T> factoryMethod) where T : notnull

Flamui/Ui.cs

@@ -112,7 +112,7 @@ private void OnRender(double obj)
         if (end.TotalMilliseconds < 16) //todo we should probably also detect the refresh rate of monitor, to know how long to sleep for (or we can try to get vsync working)s
         {
             // Console.WriteLine($"Sleeping for {end.TotalMilliseconds}");
-            Thread.Sleep(TimeSpan.FromMilliseconds(16 - end.TotalMilliseconds));
+            // Thread.Sleep(TimeSpan.FromMilliseconds(16 - end.TotalMilliseconds));
         }
     }
 
@@ -437,7 +437,7 @@ private void BuildUi()
 
         _rootComponent.Build(Ui);
 
-        Console.WriteLine(Window.Size.X);
+        // Console.WriteLine(Window.Size.X);
 
         RootContainer.PrepareLayout(Dir.Vertical);
         RootContainer.Layout(new BoxConstraint(0, Window.Size.X / GetCompleteScaling().X, 0, Window.Size.Y / GetCompleteScaling().Y));

Flamui/UiWindow.cs

@@ -45,6 +45,11 @@ public override void Build(Ui ui)
                         app.CreateWindow<LayoutTest>("Anoter Window");
                     }
 
+                    using (ui.Div().Color(C.White).ShrinkHeight())
+                    {
+                        ui.Text(loremIpsum).Color(C.Black).Multiline();
+                    }
+
                     // var dropdown = ui.CreateDropDown(selectedOption);
                     // dropdown.Component.Option("Hi");
                     // dropdown.Component.Option("Anita");