diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-04-12 10:41:41 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-04-12 10:41:41 -0600 |
commit | acbafa84774d4addeb4da0206762d64febf26d3e (patch) | |
tree | fb5abadd39155fb6b2276f1a06ce872294a9b081 /src | |
parent | fbbd2edd6f33628b6e9257cf876670759f454017 (diff) | |
download | mana-client-acbafa84774d4addeb4da0206762d64febf26d3e.tar.gz mana-client-acbafa84774d4addeb4da0206762d64febf26d3e.tar.bz2 mana-client-acbafa84774d4addeb4da0206762d64febf26d3e.tar.xz mana-client-acbafa84774d4addeb4da0206762d64febf26d3e.zip |
Fix ChatTab changing to need alt when chatting
Diffstat (limited to 'src')
-rw-r--r-- | src/game.cpp | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/game.cpp b/src/game.cpp index f264ad27..2320617c 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -629,21 +629,25 @@ void Game::handleInput() } */ } - if (keyboard.isKeyActive(keyboard.KEY_TOGGLE_CHAT)) + else if (keyboard.isKeyActive(keyboard.KEY_TOGGLE_CHAT)) { if (chatWindow->requestChatFocus()) used = true; } - if (keyboard.isKeyActive(keyboard.KEY_PREV_CHAT_TAB)) - { - chatWindow->prevTab(); - return; - } - else if (keyboard.isKeyActive(keyboard.KEY_NEXT_CHAT_TAB)) + + if (!chatWindow->isInputFocused() || (event.key.keysym.mod & KMOD_ALT)) { - chatWindow->nextTab(); - return; + if (keyboard.isKeyActive(keyboard.KEY_PREV_CHAT_TAB)) + { + chatWindow->prevTab(); + return; + } + else if (keyboard.isKeyActive(keyboard.KEY_NEXT_CHAT_TAB)) + { + chatWindow->nextTab(); + return; + } } const int tKey = keyboard.getKeyIndex(event.key.keysym.sym); |