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

(svn r24728) -Codechange: Unify usage of OnOSKInput.

release/1.3
frosch 2012-11-13 21:46:40 +00:00
parent 1071d51508
commit 336fcbc50e
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/network/network_content_gui.cpp
View File

@ -788,10 +788,12 @@ public:
virtual void OnOSKInput(int wid) virtual void OnOSKInput(int wid)
{ {
this->string_filter.SetFilterTerm(this->edit_str_buf); if (wid == WID_NCL_FILTER) {
this->content.SetFilterState(!this->string_filter.IsEmpty()); this->string_filter.SetFilterTerm(this->edit_str_buf);
this->content.ForceRebuild(); this->content.SetFilterState(!this->string_filter.IsEmpty());
this->InvalidateData(); this->content.ForceRebuild();
this->InvalidateData();
}
} }
virtual void OnResize() virtual void OnResize()

14
src/settings_gui.cpp
View File

@ -2418,13 +2418,15 @@ struct GameSettingsWindow : QueryStringBaseWindow {
virtual void OnOSKInput(int wid) virtual void OnOSKInput(int wid)
{ {
string_filter.SetFilterTerm(this->edit_str_buf); if (wid == WID_GS_FILTER) {
if (!string_filter.IsEmpty() && !this->manually_changed_folding) { string_filter.SetFilterTerm(this->edit_str_buf);
/* User never expanded/collapsed single pages and entered a filter term. if (!string_filter.IsEmpty() && !this->manually_changed_folding) {
* Expand everything, to save weird expand clicks, */ /* User never expanded/collapsed single pages and entered a filter term.
_settings_main_page.UnFoldAll(); * Expand everything, to save weird expand clicks, */
_settings_main_page.UnFoldAll();
}
this->InvalidateData();
} }
this->InvalidateData();
} }
virtual void OnResize() virtual void OnResize()

4
src/signs_gui.cpp
View File

@ -298,7 +298,7 @@ struct SignListWindow : QueryStringBaseWindow, SignList {
EventState state = ES_NOT_HANDLED; EventState state = ES_NOT_HANDLED;
switch (this->HandleEditBoxKey(WID_SIL_FILTER_TEXT, key, keycode, state)) { switch (this->HandleEditBoxKey(WID_SIL_FILTER_TEXT, key, keycode, state)) {
case HEBR_EDITING: case HEBR_EDITING:
this->SetFilterString(this->text.buf); this->OnOSKInput(WID_SIL_FILTER_TEXT);
break; break;
case HEBR_CONFIRM: // Enter pressed -> goto first sign in list case HEBR_CONFIRM: // Enter pressed -> goto first sign in list
@ -325,8 +325,6 @@ struct SignListWindow : QueryStringBaseWindow, SignList {
NOT_REACHED(); NOT_REACHED();
} }
if (state == ES_HANDLED) OnOSKInput(WID_SIL_FILTER_TEXT);
return state; return state;
} }