summaryrefslogtreecommitdiff
path: root/src/gui/charselectdialog.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-04-19 23:48:29 +0300
committerAndrei Karas <akaras@inbox.ru>2012-04-19 23:48:29 +0300
commit0b7e752bd177c90a05ca752fa31810f9e34c432c (patch)
treedb1809a48faf051af11c94058e8f126c9e9ef1ab /src/gui/charselectdialog.cpp
parent23f87c10db7e6b149e9e1f351e1a82516c545df7 (diff)
downloadplus-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.gz
plus-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.bz2
plus-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.xz
plus-0b7e752bd177c90a05ca752fa31810f9e34c432c.zip
Dehardcode keys in gui widgets.
Add new tab with keys settings in input settings tab.
Diffstat (limited to 'src/gui/charselectdialog.cpp')
-rw-r--r--src/gui/charselectdialog.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index b1b8009a4..a148376fb 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -26,6 +26,8 @@
#include "game.h"
#include "localplayer.h"
#include "units.h"
+#include "keydata.h"
+#include "keyevent.h"
#include "logger.h"
#include "gui/changeemaildialog.h"
@@ -261,9 +263,8 @@ void CharSelectDialog::action(const gcn::ActionEvent &event)
void CharSelectDialog::keyPressed(gcn::KeyEvent &keyEvent)
{
- gcn::Key key = keyEvent.getKey();
-
- if (key.getValue() == Key::ESCAPE)
+ if (static_cast<KeyEvent*>(&keyEvent)->getActionId()
+ == Input::KEY_GUI_CANCEL)
{
action(gcn::ActionEvent(mSwitchLoginButton,
mSwitchLoginButton->getActionEventId()));