diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-04-08 19:41:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-04-08 19:41:19 +0300 |
| commit | 30ef016b0a14f36dc480284e2d775295b5501dd4 (patch) | |
| tree | a269c0983efb8dc9160bfe10b1dba26a302aff0c /src/gui/chatwindow.cpp | |
| parent | 25a6eae7f4fb561bbf930be28ee09510b40ebc80 (diff) | |
| download | plus-30ef016b0a14f36dc480284e2d775295b5501dd4.tar.gz plus-30ef016b0a14f36dc480284e2d775295b5501dd4.tar.bz2 plus-30ef016b0a14f36dc480284e2d775295b5501dd4.tar.xz plus-30ef016b0a14f36dc480284e2d775295b5501dd4.zip | |
Move most input code from keyboardconfig to inputmanager.
Diffstat (limited to 'src/gui/chatwindow.cpp')
| -rw-r--r-- | src/gui/chatwindow.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp index 4040c3ce0..3832e5850 100644 --- a/src/gui/chatwindow.cpp +++ b/src/gui/chatwindow.cpp @@ -27,6 +27,7 @@ #include "commandhandler.h" #include "configuration.h" #include "guild.h" +#include "inputmanager.h" #include "keyboardconfig.h" #include "localplayer.h" #include "party.h" @@ -783,18 +784,18 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event) mCurHist = mHistory.end(); mChatInput->setText(""); } - else if (keyboard.isActionActive(Input::KEY_AUTOCOMPLETE_CHAT) && + else if (inputManager.isActionActive(Input::KEY_AUTOCOMPLETE_CHAT) && mChatInput->getText() != "") { autoComplete(); return; } - else if (keyboard.isActionActive(Input::KEY_DEACTIVATE_CHAT) && + else if (inputManager.isActionActive(Input::KEY_DEACTIVATE_CHAT) && mChatInput->isVisible()) { mChatInput->processVisible(false); } - else if (keyboard.isActionActive(Input::KEY_CHAT_PREV_HISTORY) && + else if (inputManager.isActionActive(Input::KEY_CHAT_PREV_HISTORY) && mChatInput->isVisible()) { ChatTab *tab = getFocused(); @@ -826,7 +827,7 @@ void ChatWindow::keyPressed(gcn::KeyEvent &event) mChatInput->getText().length())); } } - else if (keyboard.isActionActive(Input::KEY_CHAT_NEXT_HISTORY) && + else if (inputManager.isActionActive(Input::KEY_CHAT_NEXT_HISTORY) && mChatInput->isVisible()) { ChatTab *tab = getFocused(); |