From e398feb3b401fd96a593eb16493db1f1b8d43d0b Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Sat, 19 Apr 2025 14:44:24 +0200 Subject: [PATCH] Replace manual centre calculation with WF_CENTRE_SCREEN flag --- src/openrct2-ui/windows/InstallTrack.cpp | 7 ++----- src/openrct2-ui/windows/TrackDesignManage.cpp | 8 ++------ 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/openrct2-ui/windows/InstallTrack.cpp b/src/openrct2-ui/windows/InstallTrack.cpp index 340cfa731b..7b35529df0 100644 --- a/src/openrct2-ui/windows/InstallTrack.cpp +++ b/src/openrct2-ui/windows/InstallTrack.cpp @@ -423,11 +423,8 @@ namespace OpenRCT2::Ui::Windows gTrackDesignSceneryToggle = false; _currentTrackPieceDirection = 2; - int32_t screenWidth = ContextGetWidth(); - int32_t screenHeight = ContextGetHeight(); - auto screenPos = ScreenCoordsXY{ screenWidth / 2 - 201, std::max(kTopToolbarHeight + 1, screenHeight / 2 - 200) }; - - auto* window = windowMgr->FocusOrCreate(WindowClass::InstallTrack, screenPos, WW, WH, 0); + auto* window = windowMgr->FocusOrCreate( + WindowClass::InstallTrack, WW, WH, WF_AUTO_POSITION | WF_CENTRE_SCREEN); window->SetupTrack(path, std::move(trackDesign)); return window; diff --git a/src/openrct2-ui/windows/TrackDesignManage.cpp b/src/openrct2-ui/windows/TrackDesignManage.cpp index 043c0b8498..d97033f0c5 100644 --- a/src/openrct2-ui/windows/TrackDesignManage.cpp +++ b/src/openrct2-ui/windows/TrackDesignManage.cpp @@ -189,15 +189,11 @@ namespace OpenRCT2::Ui::Windows auto* windowMgr = Ui::GetWindowManager(); windowMgr->CloseByClass(WindowClass::TrackDeletePrompt); - int32_t screenWidth = ContextGetWidth(); - int32_t screenHeight = ContextGetHeight(); auto trackDeletePromptWindow = std::make_unique(tdFileRef); windowMgr->Create( - std::move(trackDeletePromptWindow), WindowClass::TrackDeletePrompt, - ScreenCoordsXY( - std::max(kTopToolbarHeight + 1, (screenWidth - WW_DELETE_PROMPT) / 2), (screenHeight - WH_DELETE_PROMPT) / 2), - WW_DELETE_PROMPT, WH_DELETE_PROMPT, WF_STICK_TO_FRONT | WF_TRANSPARENT); + std::move(trackDeletePromptWindow), WindowClass::TrackDeletePrompt, {}, WW_DELETE_PROMPT, WH_DELETE_PROMPT, + WF_STICK_TO_FRONT | WF_TRANSPARENT | WF_AUTO_POSITION | WF_CENTRE_SCREEN); } void TrackDeletePromptWindow::OnOpen()