mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +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

8
src/openrct2/interface/Viewport.cpp
View File

@@ -1730,7 +1730,7 @@ namespace OpenRCT2
*/
InteractionInfo GetMapCoordinatesFromPos(const ScreenCoordsXY& screenCoords, int32_t flags)
{
auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
auto* windowMgr = Ui::GetWindowManager();
WindowBase* window = windowMgr->FindFromPoint(screenCoords);
return GetMapCoordinatesFromPosWindow(window, screenCoords, flags);
}
@@ -1783,7 +1783,7 @@ namespace OpenRCT2
// if unknown viewport visibility, use the containing window to discover the status
if (viewport->visibility == VisibilityCache::Unknown)
{
auto windowManager = GetContext()->GetUiContext()->GetWindowManager();
auto windowManager = Ui::GetWindowManager();
auto owner = windowManager->GetOwner(viewport);
if (owner != nullptr && owner->classification != WindowClass::MainWindow)
{
@@ -1819,7 +1819,7 @@ namespace OpenRCT2
static Viewport* ViewportFindFromPoint(const ScreenCoordsXY& screenCoords)
{
auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
auto* windowMgr = Ui::GetWindowManager();
WindowBase* w = windowMgr->FindFromPoint(screenCoords);
if (w == nullptr)
return nullptr;
@@ -1848,7 +1848,7 @@ namespace OpenRCT2
*/
std::optional<CoordsXY> ScreenGetMapXY(const ScreenCoordsXY& screenCoords, Viewport** viewport)
{
auto* windowMgr = GetContext()->GetUiContext()->GetWindowManager();
auto* windowMgr = Ui::GetWindowManager();
// This will get the tile location but we will need the more accuracy
WindowBase* window = windowMgr->FindFromPoint(screenCoords);