mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-20 06:12:57 +01:00
Code Issues Releases Wiki Activity

Move WindowClose family into WindowManager (#23646)

Browse Source 
* Replace WindowClose() calls with Close method calls where possible

* Move WindowClose family into WindowManager

* Remove UpdateSceneryGroupIndexes hack
This commit is contained in:
Aaron van Geffen
2025-01-19 18:49:18 +01:00
committed by GitHub
parent be9f27e4f9
commit a8773dd805
63 changed files with 499 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2-ui/interface/Window.cpp
View File

@@ -423,18 +423,21 @@ namespace OpenRCT2
}
else
{
WindowClose(*this);
auto* windowMgr = Ui::GetWindowManager();
windowMgr->Close(*this);
}
}
void Window::CloseOthers()
{
WindowCloseAllExceptNumberAndClass(number, classification);
auto* windowMgr = Ui::GetWindowManager();
windowMgr->CloseAllExceptNumberAndClass(number, classification);
}
void Window::CloseOthersOfThisClass()
{
WindowCloseByClass(classification);
auto* windowMgr = Ui::GetWindowManager();
windowMgr->CloseByClass(classification);
}
CloseWindowModifier Window::GetCloseModifier()
@@ -597,7 +600,8 @@ namespace OpenRCT2::Ui::Windows
_currentTextBox.widget_index = callWidget;
_textBoxFrameNo = 0;
WindowCloseByClass(WindowClass::Textinput);
auto* windowMgr = Ui::GetWindowManager();
windowMgr->CloseByClass(WindowClass::Textinput);
_textBoxInput = existingText;