diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-19 23:48:29 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-19 23:48:29 +0300 |
| commit | 0b7e752bd177c90a05ca752fa31810f9e34c432c (patch) | |
| tree | db1809a48faf051af11c94058e8f126c9e9ef1ab /src/gui/gui.cpp | |
| parent | 23f87c10db7e6b149e9e1f351e1a82516c545df7 (diff) | |
| download | manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.gz manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.bz2 manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.tar.xz manaverse-0b7e752bd177c90a05ca752fa31810f9e34c432c.zip | |
Dehardcode keys in gui widgets.
Add new tab with keys settings in input settings tab.
Diffstat (limited to 'src/gui/gui.cpp')
| -rw-r--r-- | src/gui/gui.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 61e434d77..1536feb68 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -24,9 +24,9 @@ #include "gui/focushandler.h" #include "gui/palette.h" +#include "gui/sdlfont.h" #include "gui/sdlinput.h" #include "gui/theme.h" -#include "gui/sdlfont.h" #include "gui/widgets/mouseevent.h" #include "gui/widgets/window.h" @@ -35,6 +35,7 @@ #include "configlistener.h" #include "configuration.h" #include "graphics.h" +#include "keydata.h" #include "keyevent.h" #include "keyinput.h" #include "logger.h" @@ -343,7 +344,7 @@ bool Gui::handleKeyInput2() // tabbing is enable check for tab press and // change focus. if (!keyEventConsumed && mTabbing - && keyInput.getKey().getValue() == Key::TAB + && keyInput.getActionId() == Input::KEY_GUI_TAB && keyInput.getType() == gcn::KeyInput::PRESSED) { if (keyInput.isShiftPressed()) |