dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #264: Crash before calling SDL_SetTextInputRect with no window focused

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-05-30 07:38:37 +01:00
parent 62e3bfd684
commit bf87578173
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/video/sdl2_v.cpp
View File

@@ -50,6 +50,7 @@ static std::string _editing_text;
static void SetTextInputRect(); static void SetTextInputRect();
bool IsWindowFocused();
Point GetFocusedWindowCaret(); Point GetFocusedWindowCaret();
Point GetFocusedWindowTopLeft(); Point GetFocusedWindowTopLeft();
bool FocusedWindowIsConsole(); bool FocusedWindowIsConsole();
@@ -432,6 +433,8 @@ bool VideoDriver_SDL_Base::ClaimMousePointer()
static void SetTextInputRect() static void SetTextInputRect()
{ {
if (!IsWindowFocused()) return;
SDL_Rect winrect; SDL_Rect winrect;
Point caret = GetFocusedWindowCaret(); Point caret = GetFocusedWindowCaret();
Point win = GetFocusedWindowTopLeft(); Point win = GetFocusedWindowTopLeft();

7
src/window.cpp
View File

@@ -452,6 +452,11 @@ void SetFocusedWindow(Window *w)
if (_focused_window != nullptr) _focused_window->OnFocus(old_focused); if (_focused_window != nullptr) _focused_window->OnFocus(old_focused);
} }
bool IsWindowFocused()
{
return _focused_window != nullptr;
}
Point GetFocusedWindowCaret() Point GetFocusedWindowCaret()
{ {
return _focused_window->GetCaretPosition(); return _focused_window->GetCaretPosition();
@@ -519,7 +524,7 @@ bool Window::SetFocusedWidget(int widget_index)
if (this->nested_focus->type == WWT_EDITBOX) VideoDriver::GetInstance()->EditBoxLostFocus(); if (this->nested_focus->type == WWT_EDITBOX) VideoDriver::GetInstance()->EditBoxLostFocus();
} }
this->nested_focus = this->GetWidget<NWidgetCore>(widget_index); this->nested_focus = this->GetWidget<NWidgetCore>(widget_index);
if (this->nested_focus->type == WWT_EDITBOX) VideoDriver::GetInstance()->EditBoxGainedFocus(); if (_focused_window == this && this->nested_focus->type == WWT_EDITBOX) VideoDriver::GetInstance()->EditBoxGainedFocus();
return true; return true;
} }