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

(svn r24732) -Codechange: Unify handling of OK and CANCEL actions for editboxes.

Browse Source
This commit is contained in:
frosch
2012-11-13 21:46:58 +00:00
parent fd55399167
commit 7699a7dc06
10 changed files with 65 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/misc_gui.cpp
View File

@@ -819,6 +819,20 @@ HandleEditBoxResult QueryStringBaseWindow::HandleEditBoxKey(int wid, uint16 key,
this->OnOSKInput(wid);
break;
case HEBR_CONFIRM:
if (this->ok_button >= 0) {
this->OnClick(Point(), this->ok_button, 1);
}
break;
case HEBR_CANCEL:
if (this->cancel_button >= 0) {
this->OnClick(Point(), this->cancel_button, 1);
} else {
this->UnfocusFocusedWidget();
}
break;
default: break;
}
return result;
@@ -905,12 +919,7 @@ struct QueryStringWindow : public QueryStringBaseWindow
virtual EventState OnKeyPress(uint16 key, uint16 keycode)
{
EventState state = ES_NOT_HANDLED;
switch (this->HandleEditBoxKey(WID_QS_TEXT, key, keycode, state)) {
default: break;
case HEBR_CONFIRM: this->OnOk();
/* FALL THROUGH */
case HEBR_CANCEL: delete this; break; // close window, abandon changes
}
this->HandleEditBoxKey(WID_QS_TEXT, key, keycode, state);
return state;
}