1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-22 22:34:33 +01:00

Move WindowCreate and WindowFocusOrCreate into WindowManager (#23643)

* Move WindowBringToFront into WindowManager

* Move WindowCreate and WindowFocusOrCreate into WindowManager

* Cut back on Context/UiContext includes
This commit is contained in:
Aaron van Geffen
2025-01-19 10:58:28 +01:00
committed by GitHub
parent 66ede938f8
commit bed4d5bdca
113 changed files with 895 additions and 767 deletions

View File

@@ -19,6 +19,7 @@
#include <openrct2/config/Config.h>
#include <openrct2/network/network.h>
#include <openrct2/scenario/Scenario.h>
#include <openrct2/ui/WindowManager.h>
#include <openrct2/windows/Intent.h>
namespace OpenRCT2::Ui::Windows
@@ -229,8 +230,10 @@ namespace OpenRCT2::Ui::Windows
}
}
auto* windowMgr = GetWindowManager();
// Check if window is already open
WindowBase* window = WindowBringToFrontByClass(WindowClass::SavePrompt);
auto* window = windowMgr->BringToFrontByClass(WindowClass::SavePrompt);
if (window != nullptr)
{
WindowClose(*window);
@@ -251,7 +254,7 @@ namespace OpenRCT2::Ui::Windows
}
auto savePromptWindow = std::make_unique<SavePromptWindow>(prompt_mode);
return WindowCreate(
return windowMgr->Create(
std::move(savePromptWindow), WindowClass::SavePrompt, {}, width, height,
WF_TRANSPARENT | WF_STICK_TO_FRONT | WF_CENTRE_SCREEN | WF_AUTO_POSITION);
}