From dc88090b5d75dd34214c2619b27532788b959995 Mon Sep 17 00:00:00 2001 From: Titus Tscharntke Date: Wed, 14 Nov 2012 23:51:18 +0000 Subject: [PATCH] no screenshots when using hotkeys for listboxes --- source/glest_game/menu/menu_state_custom_game.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp index e6f86e049..d466028f0 100644 --- a/source/glest_game/menu/menu_state_custom_game.cpp +++ b/source/glest_game/menu/menu_state_custom_game.cpp @@ -1053,6 +1053,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton) { //printf("lastKey = %d [%c]\n",lastKey,lastKey); advanceToItemStartingWith = lastKey; } + if(activeInputLabel!=NULL && !(activeInputLabel->mouseClick(x,y))){ setActiveInputLabel(NULL); } @@ -1380,7 +1381,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton) { } } } - else if(listBoxFactions[i].mouseClick(x, y)) { + else if(listBoxFactions[i].mouseClick(x, y,advanceToItemStartingWith)) { // Disallow CPU players to be observers if(factionFiles[listBoxFactions[i].getSelectedItemIndex()] == formatString(GameConstants::OBSERVER_SLOTNAME) && (listBoxControls[i].getSelectedItemIndex() == ctCpuEasy || listBoxControls[i].getSelectedItemIndex() == ctCpu || @@ -3936,7 +3937,8 @@ void MenuStateCustomGame::keyDown(SDL_KeyboardEvent key) { if(hasNetworkGameSettings() == true) { chatManager.keyDown(key); } - if(chatManager.getEditEnabled() == false) { + if(chatManager.getEditEnabled() == false && + (Shared::Platform::Window::isKeyStateModPressed(KMOD_SHIFT) == false) ) { Config &configKeys = Config::getInstance(std::pair(cfgMainKeys,cfgUserKeys)); //if(key == configKeys.getCharKey("ShowFullConsole")) {