Update to 13.4

This commit is contained in:
dP
2023-07-31 19:33:16 +04:00
parent 9be99d15c3
commit 79037e2c65
48 changed files with 687 additions and 252 deletions
+3 -3
View File
@@ -469,7 +469,7 @@ void SetFocusedWindow(Window *w)
_focused_window = w;
/* So we can inform it that it lost focus */
if (old_focused != nullptr) old_focused->OnFocusLost();
if (old_focused != nullptr) old_focused->OnFocusLost(false);
if (_focused_window != nullptr) _focused_window->OnFocus();
}
@@ -545,7 +545,7 @@ void Window::OnFocus()
/**
* Called when window loses focus
*/
void Window::OnFocusLost()
void Window::OnFocusLost(bool closing)
{
if (this->nested_focus != nullptr && this->nested_focus->type == WWT_EDITBOX) VideoDriver::GetInstance()->EditBoxLostFocus();
}
@@ -1127,7 +1127,7 @@ void Window::Close()
/* Make sure we don't try to access this window as the focused window when it doesn't exist anymore. */
if (_focused_window == this) {
this->OnFocusLost();
this->OnFocusLost(true);
_focused_window = nullptr;
}