mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-29 09:29:10 +00:00
Code Issues 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

8
src/network/network_chat_gui.cpp
View File

@@ -512,13 +512,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
state = ES_HANDLED;
} else {
_chat_tab_completion_active = false;
switch (this->HandleEditBoxKey(WID_NC_TEXTBOX, key, keycode, state)) {
default: break;
case HEBR_CONFIRM:
SendChat(this->text.buf, this->dtype, this->dest);
/* FALL THROUGH */
case HEBR_CANCEL: delete this; break;
}
this->HandleEditBoxKey(WID_NC_TEXTBOX, key, keycode, state);
}
return state;
}

33
src/network/network_gui.cpp
View File

@@ -835,20 +835,15 @@ public:
return ES_HANDLED;
}
switch (this->HandleEditBoxKey(WID_NG_CLIENT, key, keycode, state)) {
case HEBR_NOT_FOCUSED:
if (this->server != NULL) {
if (keycode == WKC_DELETE) { // Press 'delete' to remove servers
NetworkGameListRemoveItem(this->server);
if (this->server == this->last_joined) this->last_joined = NULL;
this->server = NULL;
this->list_pos = SLP_INVALID;
}
if (this->HandleEditBoxKey(WID_NG_CLIENT, key, keycode, state) == HEBR_NOT_FOCUSED) {
if (this->server != NULL) {
if (keycode == WKC_DELETE) { // Press 'delete' to remove servers
NetworkGameListRemoveItem(this->server);
if (this->server == this->last_joined) this->last_joined = NULL;
this->server = NULL;
this->list_pos = SLP_INVALID;
}
break;
default:
break;
}
}
return state;
@@ -2160,17 +2155,7 @@ struct NetworkCompanyPasswordWindow : public QueryStringBaseWindow {
virtual EventState OnKeyPress(uint16 key, uint16 keycode)
{
EventState state = ES_NOT_HANDLED;
switch (this->HandleEditBoxKey(WID_NCP_PASSWORD, key, keycode, state)) {
default: break;
case HEBR_CONFIRM:
this->OnOk();
/* FALL THROUGH */
case HEBR_CANCEL:
delete this;
break;
}
this->HandleEditBoxKey(WID_NCP_PASSWORD, key, keycode, state);
return state;
}
};