- another attempt to fix keyboard menu for windows

This commit is contained in:
Mark Vejvoda 2011-03-06 07:29:30 +00:00
parent 9104141efe
commit d9e6b45052

View File

@ -476,25 +476,30 @@ void MenuStateOptions::mouseClick(int x, int y, MouseButton mouseButton){
saveConfig(); saveConfig();
mainMenu->setState(new MenuStateRoot(program, mainMenu)); mainMenu->setState(new MenuStateRoot(program, mainMenu));
return;
} }
else if(buttonAbort.mouseClick(x, y)){ else if(buttonAbort.mouseClick(x, y)){
soundRenderer.playFx(coreData.getClickSoundA()); soundRenderer.playFx(coreData.getClickSoundA());
mainMenu->setState(new MenuStateRoot(program, mainMenu)); mainMenu->setState(new MenuStateRoot(program, mainMenu));
return;
} }
else if(buttonAutoConfig.mouseClick(x, y)){ else if(buttonAutoConfig.mouseClick(x, y)){
soundRenderer.playFx(coreData.getClickSoundA()); soundRenderer.playFx(coreData.getClickSoundA());
Renderer::getInstance().autoConfig(); Renderer::getInstance().autoConfig();
saveConfig(); saveConfig();
mainMenu->setState(new MenuStateOptions(program, mainMenu)); mainMenu->setState(new MenuStateOptions(program, mainMenu));
return;
} }
else if(buttonVideoInfo.mouseClick(x, y)){ else if(buttonVideoInfo.mouseClick(x, y)){
soundRenderer.playFx(coreData.getClickSoundA()); soundRenderer.playFx(coreData.getClickSoundA());
mainMenu->setState(new MenuStateGraphicInfo(program, mainMenu)); mainMenu->setState(new MenuStateGraphicInfo(program, mainMenu));
return;
} }
else if(buttonKeyboardSetup.mouseClick(x, y)){ else if(buttonKeyboardSetup.mouseClick(x, y)){
soundRenderer.playFx(coreData.getClickSoundA()); soundRenderer.playFx(coreData.getClickSoundA());
mainMenu->setState(new MenuStateKeysetup(program, mainMenu)); // open keyboard shortcuts setup screen mainMenu->setState(new MenuStateKeysetup(program, mainMenu)); // open keyboard shortcuts setup screen
//showMessageBox("Not implemented yet", "Keyboard setup", false); //showMessageBox("Not implemented yet", "Keyboard setup", false);
return;
} }
else if(labelPlayerName.mouseClick(x, y) && ( activeInputLabel != &labelPlayerName )){ else if(labelPlayerName.mouseClick(x, y) && ( activeInputLabel != &labelPlayerName )){
setActiveInputLable(&labelPlayerName); setActiveInputLable(&labelPlayerName);