mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Code Issues Releases Wiki Activity

Move WindowCreate and WindowFocusOrCreate into WindowManager (#23643)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

13
src/openrct2-ui/windows/TitleMenu.cpp
View File

@@ -11,7 +11,6 @@
#include <openrct2-ui/interface/Widget.h>
#include <openrct2-ui/scripting/CustomMenu.h>
#include <openrct2-ui/windows/Window.h>
#include <openrct2/Context.h>
#include <openrct2/Editor.h>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
@@ -121,7 +120,7 @@ namespace OpenRCT2::Ui::Windows
{
WindowBase* windowToOpen = nullptr;
auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
auto* windowMgr = GetWindowManager();
switch (widgetIndex)
{
@@ -129,7 +128,7 @@ namespace OpenRCT2::Ui::Windows
windowToOpen = windowMgr->FindByClass(WindowClass::ScenarioSelect);
if (windowToOpen != nullptr)
{
WindowBringToFront(*windowToOpen);
windowMgr->BringToFront(*windowToOpen);
}
else
{
@@ -142,7 +141,7 @@ namespace OpenRCT2::Ui::Windows
windowToOpen = windowMgr->FindByClass(WindowClass::Loadsave);
if (windowToOpen != nullptr)
{
WindowBringToFront(*windowToOpen);
windowMgr->BringToFront(*windowToOpen);
}
else
{
@@ -156,7 +155,7 @@ namespace OpenRCT2::Ui::Windows
windowToOpen = windowMgr->FindByClass(WindowClass::ServerList);
if (windowToOpen != nullptr)
{
WindowBringToFront(*windowToOpen);
windowMgr->BringToFront(*windowToOpen);
}
else
{
@@ -287,7 +286,9 @@ namespace OpenRCT2::Ui::Windows
WindowBase* TitleMenuOpen()
{
const uint16_t windowHeight = MenuButtonDims.height + UpdateButtonDims.height;
return WindowCreate<TitleMenuWindow>(
auto* windowMgr = GetWindowManager();
return windowMgr->Create<TitleMenuWindow>(
WindowClass::TitleMenu, ScreenCoordsXY(0, ContextGetHeight() - 182), 0, windowHeight,
WF_STICK_TO_BACK | WF_TRANSPARENT | WF_NO_BACKGROUND);
}