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

(svn r24743) -Change: Unify the behaviour of ESC in filter editboxes.

Browse Source
This commit is contained in:
frosch
2012-11-14 22:50:39 +00:00
parent f5d8ba5d7f
commit c283a41248
6 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/window.cpp
View File

@@ -2265,6 +2265,8 @@ EventState Window::HandleEditBoxKey(int wid, uint16 key, uint16 keycode)
QueryString *query = this->GetQueryString(wid);
if (query == NULL) return state;
int action = QueryString::ACTION_NOTHING;
switch (query->HandleEditBoxKey(this, wid, key, keycode, state)) {
case HEBR_EDITING:
this->OnEditboxChanged(wid);
@@ -2273,6 +2275,8 @@ EventState Window::HandleEditBoxKey(int wid, uint16 key, uint16 keycode)
case HEBR_CONFIRM:
if (query->ok_button >= 0) {
this->OnClick(Point(), query->ok_button, 1);
} else {
action = query->ok_button;
}
break;
@@ -2280,13 +2284,28 @@ EventState Window::HandleEditBoxKey(int wid, uint16 key, uint16 keycode)
if (query->cancel_button >= 0) {
this->OnClick(Point(), query->cancel_button, 1);
} else {
this->UnfocusFocusedWidget();
action = query->cancel_button;
}
break;
default: break;
}
switch (action) {
case QueryString::ACTION_DESELECT:
this->UnfocusFocusedWidget();
break;
case QueryString::ACTION_CLEAR:
query->text.DeleteAll();
this->SetWidgetDirty(wid);
this->OnEditboxChanged(wid);
break;
default:
break;
}
return state;
}