Fix staff window viewport not appearing on open

mixiate · mixiate · commit 6113774afc7b · 2025-05-18T05:44:20.000+01:00
diff --git a/src/openrct2-ui/windows/Staff.cpp b/src/openrct2-ui/windows/Staff.cpp
@@ -531,6 +531,14 @@ namespace OpenRCT2::Ui::Windows
 
             widgets[WIDX_FIRE].left = width - 25;
             widgets[WIDX_FIRE].right = width - 2;
+
+            if (viewport != nullptr)
+            {
+                const Widget& viewportWidget = widgets[WIDX_VIEWPORT];
+                viewport->pos = windowPos + ScreenCoordsXY{ viewportWidget.left + 1, viewportWidget.top + 1 };
+                viewport->width = widgets[WIDX_VIEWPORT].width() - 1;
+                viewport->height = widgets[WIDX_VIEWPORT].height() - 1;
+            }
         }
 
         void OverviewDraw(RenderTarget& rt)
@@ -605,21 +613,6 @@ namespace OpenRCT2::Ui::Windows
         {
             WindowSetResize(*this, { WW, WH }, { 500, 450 });
 
-            if (viewport != nullptr)
-            {
-                auto widget = widgets[WIDX_VIEWPORT];
-                auto newWidth = widget.width() - 1;
-                auto newHeight = widget.height() - 1;
-                viewport->pos = windowPos + ScreenCoordsXY{ widget.left + 1, widget.top + 1 };
-
-                // Update the viewport size
-                if (viewport->width != newWidth || viewport->height != newHeight)
-                {
-                    viewport->width = newWidth;
-                    viewport->height = newHeight;
-                }
-            }
-
             ViewportInit();
         }
 
@@ -1229,7 +1222,10 @@ namespace OpenRCT2::Ui::Windows
             return nullptr;
 
         if (w != nullptr)
+        {
             w->Initialise(peep->Id);
+            w->OnResize(); // Initialise viewport after peep id is set
+        }
 
         return w;
     }
