ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

when settings keys in Options, focus will stay where it was, making it much less annoying to configure without mouse

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@3556 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria
2009-05-30 19:41:04 +00:00
parent ff77ab2184
commit e066360e79
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/options_screen.cpp
View File

@@ -269,6 +269,7 @@ namespace StateManager
// -----------------------------------------------------------------------------
static PlayerAction binding_to_set;
static std::string binding_to_set_button;
void eventInput(Widget* widget, const std::string& name)
{
@@ -302,6 +303,8 @@ namespace StateManager
}
else if(name.find("binding_") != std::string::npos)
{
binding_to_set_button = name;
if(name == "binding_up")
{
binding_to_set = PA_ACCEL;
@@ -355,15 +358,21 @@ namespace StateManager
// -----------------------------------------------------------------------------
void gotSensedInput(Input* sensedInput)
{
getCurrentScreen()->dismissModalDialog();
input_manager->setMode(InputManager::MENU);
if(sensedInput->type == Input::IT_KEYBOARD)
{
KeyboardDevice* keyboard = input_manager->getDeviceList()->getKeyboard(0);
keyboard->editBinding(binding_to_set, sensedInput->btnID);
// GUIEngine::getGUIEnv()->setFocus( btn->m_element );
// refresh display
initInput(NULL, "init");
// re-select the previous button
ButtonWidget* btn = getCurrentScreen()->getWidget<ButtonWidget>(binding_to_set_button.c_str());
assert( btn != NULL );
GUIEngine::getGUIEnv()->setFocus( btn->m_element );
}
else if(sensedInput->type == Input::IT_STICKMOTION)
{
@@ -374,9 +383,6 @@ namespace StateManager
std::cout << "gamepad " << sensedInput->deviceID << " button " << sensedInput->btnID << std::endl;
}
getCurrentScreen()->dismissModalDialog();
input_manager->setMode(InputManager::MENU);
// save new binding to file
input_manager->getDeviceList()->serialize();
}