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

(svn r24733) -Codechange: Move handling of editbox keys to window class.

Browse Source
This commit is contained in:
frosch
2012-11-13 21:47:02 +00:00
parent 7699a7dc06
commit c4d7c8dd42
13 changed files with 34 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/misc_gui.cpp
View File

@@ -811,10 +811,10 @@ void QueryString::DrawEditBox(const Window *w, int wid) const
_cur_dpi = old_dpi;
}
HandleEditBoxResult QueryStringBaseWindow::HandleEditBoxKey(int wid, uint16 key, uint16 keycode, EventState &state)
EventState QueryStringBaseWindow::HandleEditBoxKey(int wid, uint16 key, uint16 keycode)
{
HandleEditBoxResult result = this->QueryString::HandleEditBoxKey(this, wid, key, keycode, state);
switch (result) {
EventState state = ES_NOT_HANDLED;
switch (this->QueryString::HandleEditBoxKey(this, wid, key, keycode, state)) {
case HEBR_EDITING:
this->OnOSKInput(wid);
break;
@@ -835,7 +835,7 @@ HandleEditBoxResult QueryStringBaseWindow::HandleEditBoxKey(int wid, uint16 key,
default: break;
}
return result;
return state;
}
/** Class for the string query window. */
@@ -916,13 +916,6 @@ struct QueryStringWindow : public QueryStringBaseWindow
}
}
virtual EventState OnKeyPress(uint16 key, uint16 keycode)
{
EventState state = ES_NOT_HANDLED;
this->HandleEditBoxKey(WID_QS_TEXT, key, keycode, state);
return state;
}
~QueryStringWindow()
{
if (!this->handled && this->parent != NULL) {