mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r24728) -Codechange: Unify usage of OnOSKInput.
This commit is contained in:
parent
1071d51508
commit
336fcbc50e
|
@ -788,10 +788,12 @@ public:
|
|||
|
||||
virtual void OnOSKInput(int wid)
|
||||
{
|
||||
this->string_filter.SetFilterTerm(this->edit_str_buf);
|
||||
this->content.SetFilterState(!this->string_filter.IsEmpty());
|
||||
this->content.ForceRebuild();
|
||||
this->InvalidateData();
|
||||
if (wid == WID_NCL_FILTER) {
|
||||
this->string_filter.SetFilterTerm(this->edit_str_buf);
|
||||
this->content.SetFilterState(!this->string_filter.IsEmpty());
|
||||
this->content.ForceRebuild();
|
||||
this->InvalidateData();
|
||||
}
|
||||
}
|
||||
|
||||
virtual void OnResize()
|
||||
|
|
|
@ -2418,13 +2418,15 @@ struct GameSettingsWindow : QueryStringBaseWindow {
|
|||
|
||||
virtual void OnOSKInput(int wid)
|
||||
{
|
||||
string_filter.SetFilterTerm(this->edit_str_buf);
|
||||
if (!string_filter.IsEmpty() && !this->manually_changed_folding) {
|
||||
/* User never expanded/collapsed single pages and entered a filter term.
|
||||
* Expand everything, to save weird expand clicks, */
|
||||
_settings_main_page.UnFoldAll();
|
||||
if (wid == WID_GS_FILTER) {
|
||||
string_filter.SetFilterTerm(this->edit_str_buf);
|
||||
if (!string_filter.IsEmpty() && !this->manually_changed_folding) {
|
||||
/* User never expanded/collapsed single pages and entered a filter term.
|
||||
* Expand everything, to save weird expand clicks, */
|
||||
_settings_main_page.UnFoldAll();
|
||||
}
|
||||
this->InvalidateData();
|
||||
}
|
||||
this->InvalidateData();
|
||||
}
|
||||
|
||||
virtual void OnResize()
|
||||
|
|
|
@ -298,7 +298,7 @@ struct SignListWindow : QueryStringBaseWindow, SignList {
|
|||
EventState state = ES_NOT_HANDLED;
|
||||
switch (this->HandleEditBoxKey(WID_SIL_FILTER_TEXT, key, keycode, state)) {
|
||||
case HEBR_EDITING:
|
||||
this->SetFilterString(this->text.buf);
|
||||
this->OnOSKInput(WID_SIL_FILTER_TEXT);
|
||||
break;
|
||||
|
||||
case HEBR_CONFIRM: // Enter pressed -> goto first sign in list
|
||||
|
@ -325,8 +325,6 @@ struct SignListWindow : QueryStringBaseWindow, SignList {
|
|||
NOT_REACHED();
|
||||
}
|
||||
|
||||
if (state == ES_HANDLED) OnOSKInput(WID_SIL_FILTER_TEXT);
|
||||
|
||||
return state;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue