miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
dP
2024-02-19 12:16:07 +05:30
parent 1ad31b0b7c e2be69e345
commit 48e926c2cf
183 changed files with 9534 additions and 5696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/window.cpp
View File

@@ -1031,10 +1031,10 @@ void Window::SetShaded(bool make_shaded)
* @param wc Window class of the window to remove; #WC_INVALID if class does not matter
* @return a Window pointer that is the child of \a w, or \c nullptr otherwise
*/
static Window *FindChildWindow(const Window *w, WindowClass wc)
Window *Window::FindChildWindow(WindowClass wc) const
{
for (Window *v : Window::Iterate()) {
if ((wc == WC_INVALID || wc == v->window_class) && v->parent == w) return v;
if ((wc == WC_INVALID || wc == v->window_class) && v->parent == this) return v;
}
return nullptr;
@@ -1046,10 +1046,10 @@ static Window *FindChildWindow(const Window *w, WindowClass wc)
*/
void Window::CloseChildWindows(WindowClass wc) const
{
Window *child = FindChildWindow(this, wc);
Window *child = this->FindChildWindow(wc);
while (child != nullptr) {
child->Close();
child = FindChildWindow(this, wc);
child = this->FindChildWindow(wc);
}
}