fix race condition when updating size

Mupen64-Rewrite · Aug 17, 2023 · e169c41 · e169c41
1 parent ab3f55d
commit e169c41
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/M64RPFW.ViewModels/LuaViewModel.cs b/M64RPFW.ViewModels/LuaViewModel.cs
@@ -50,8 +50,6 @@ private void Stop()
     [RelayCommand]
     private void Run()
     {
-        // TODO: investigate window sizing service reporting wrong dimensions when resized in quick succession
-        // https://discord.com/channels/723573549607944272/883784450108960769/1141361872373821550
         if (IsRunning)
             Stop();
 

diff --git a/M64RPFW.Views.Avalonia/Views/MainWindow_Services.cs b/M64RPFW.Views.Avalonia/Views/MainWindow_Services.cs
@@ -20,7 +20,10 @@ public partial class MainWindow : IViewDialogService, ILuaInterfaceService
 
     public WindowSize GetWindowSize()
     {
-        return Dispatcher.UIThread.Invoke(() => new WindowSize(GlControl.Bounds.Width, GlControl.Bounds.Height));
+        return Dispatcher.UIThread.Invoke(() =>
+        {
+            return new WindowSize(GlControl.Bounds.Width, GlControl.Bounds.Height);
+        });
     }
 
 
@@ -43,7 +46,7 @@ public void SizeToFit(WindowSize size)
             // TODO synchronize this somehow
             GlControl.MinWidth = GlControl.MaxWidth = size.Width;
             GlControl.MinHeight = GlControl.MaxHeight = size.Height;
-            InvalidateMeasure();
+            UpdateLayout();
         });
     }