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

8
src/network/network_chat_gui.cpp
View File

@@ -510,13 +510,15 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
if (keycode == WKC_TAB) {
ChatTabCompletion();
state = ES_HANDLED;
} else {
_chat_tab_completion_active = false;
this->HandleEditBoxKey(WID_NC_TEXTBOX, key, keycode, state);
}
return state;
}
virtual void OnOSKInput(int wid)
{
_chat_tab_completion_active = false;
}
/**
* Some data on this window has become invalid.
* @param data Information about the changed data.

8
src/network/network_content_gui.cpp
View File

@@ -763,12 +763,8 @@ public:
}
/* FALL THROUGH, space is pressed and filter isn't focused. */
default: {
/* Handle editbox input */
EventState state = ES_NOT_HANDLED;
this->HandleEditBoxKey(WID_NCL_FILTER, key, keycode, state);
return state;
}
default:
return ES_NOT_HANDLED;
}
if (_network_content_client.Length() == 0) return ES_HANDLED;

28
src/network/network_gui.cpp
View File

@@ -835,14 +835,12 @@ public:
return ES_HANDLED;
}
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;
}
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;
}
}
@@ -1172,13 +1170,6 @@ struct NetworkStartServerWindow : public QueryStringBaseWindow {
this->SetDirty();
}
virtual EventState OnKeyPress(uint16 key, uint16 keycode)
{
EventState state = ES_NOT_HANDLED;
this->HandleEditBoxKey(WID_NSS_GAMENAME, key, keycode, state);
return state;
}
virtual void OnOSKInput(int wid)
{
if (wid == WID_NSS_GAMENAME) {
@@ -2151,13 +2142,6 @@ struct NetworkCompanyPasswordWindow : public QueryStringBaseWindow {
break;
}
}
virtual EventState OnKeyPress(uint16 key, uint16 keycode)
{
EventState state = ES_NOT_HANDLED;
this->HandleEditBoxKey(WID_NCP_PASSWORD, key, keycode, state);
return state;
}
};
static const NWidgetPart _nested_network_company_password_window_widgets[] = {