mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: Allow dropdowns to steal/lose focus regardless of focus-stealing prevention.

pull/10938/head
Peter Nelson 2023-06-14 08:55:15 +01:00
parent 00367aa391
commit a6a9223057
No known key found for this signature in database
GPG Key ID: 8EF8F0A467DF75ED
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/window.cpp
View File

@ -613,12 +613,17 @@ static void DispatchLeftClickEvent(Window *w, int x, int y, int click_count)
if (nw != nullptr) ClrBit(nw->disp_flags, NDB_DROPDOWN_CLOSED); if (nw != nullptr) ClrBit(nw->disp_flags, NDB_DROPDOWN_CLOSED);
bool focused_widget_changed = false; bool focused_widget_changed = false;
/* If clicked on a window that previously did not have focus */ /* If clicked on a window that previously did not have focus */
if (_focused_window != w && // We already have focus, right? if (_focused_window != w) {
(w->window_desc.flags & WDF_NO_FOCUS) == 0 && // Don't lose focus to toolbars /* Don't switch focus to an unfocusable window, or if the 'X' (close button) was clicked. */
widget_type != WWT_CLOSEBOX) { // Don't change focused window if 'X' (close button) was clicked if ((w->window_desc.flags & WDF_NO_FOCUS) == 0 && widget_type != WWT_CLOSEBOX) {
focused_widget_changed = true; focused_widget_changed = true;
SetFocusedWindow(w); SetFocusedWindow(w);
} else if (_focused_window != nullptr && _focused_window->window_class == WC_DROPDOWN_MENU) {
/* Previously focused window was a dropdown menu, close it even if clicked window is unfocusable. */
SetFocusedWindow(nullptr);
}
} }
if (nw == nullptr) return; // exit if clicked outside of widgets if (nw == nullptr) return; // exit if clicked outside of widgets
@ -1386,7 +1391,7 @@ void Window::InitializeData(WindowNumber window_number)
* (so we don't interrupt typing) unless the new window has a text box. */ * (so we don't interrupt typing) unless the new window has a text box. */
bool dropdown_active = _focused_window != nullptr && _focused_window->window_class == WC_DROPDOWN_MENU; bool dropdown_active = _focused_window != nullptr && _focused_window->window_class == WC_DROPDOWN_MENU;
bool editbox_active = EditBoxInGlobalFocus() && this->nested_root->GetWidgetOfType(WWT_EDITBOX) == nullptr; bool editbox_active = EditBoxInGlobalFocus() && this->nested_root->GetWidgetOfType(WWT_EDITBOX) == nullptr;
if (!dropdown_active && !editbox_active) SetFocusedWindow(this); if (this->window_class == WC_DROPDOWN_MENU || (!dropdown_active && !editbox_active)) SetFocusedWindow(this);
/* Insert the window into the correct location in the z-ordering. */ /* Insert the window into the correct location in the z-ordering. */
BringWindowToFront(this, false); BringWindowToFront(this, false);