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

Allow to use shift + tab to switch to previous field.

Browse Source 
Thanks to xXFlorianXx.
This commit is contained in:
Deve 2015-03-09 18:44:10 +01:00
parent 248755abee
commit 0a7234df84
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/input/input_manager.cpp
View File

@ -544,7 +544,8 @@ int InputManager::getPlayerKeyboardID() const
*/
void InputManager::dispatchInput(Input::InputType type, int deviceID,
int button,
Input::AxisDirection axisDirection, int value)
Input::AxisDirection axisDirection, int value,
bool shift_mask)
{
// Act different in input sensing mode.
if (m_mode == INPUT_SENSE_KEYBOARD ||
@ -597,7 +598,17 @@ void InputManager::dispatchInput(Input::InputType type, int deviceID,
else if (button == KEY_RIGHT) action = PA_MENU_RIGHT;
else if (button == KEY_SPACE) action = PA_MENU_SELECT;
else if (button == KEY_RETURN) action = PA_MENU_SELECT;
else if (button == KEY_TAB) action = PA_MENU_DOWN;
else if (button == KEY_TAB)
{
if (shift_mask)
{
action = PA_MENU_UP;
}
else
{
action = PA_MENU_DOWN;
}
}
if (button == KEY_RETURN && GUIEngine::ModalDialog::isADialogActive())
{
@ -922,7 +933,8 @@ EventPropagation InputManager::input(const SEvent& event)
const bool wasInTextBox = GUIEngine::isWithinATextBox();
dispatchInput(Input::IT_KEYBOARD, event.KeyInput.Char, key,
Input::AD_POSITIVE, Input::MAX_VALUE);
Input::AD_POSITIVE, Input::MAX_VALUE,
event.KeyInput.Shift);
// if this action took us into a text box, don't let event continue
// (FIXME not the cleanest solution)
@ -951,7 +963,7 @@ EventPropagation InputManager::input(const SEvent& event)
}
dispatchInput(Input::IT_KEYBOARD, event.KeyInput.Char, key,
Input::AD_POSITIVE, 0);
Input::AD_POSITIVE, 0, event.KeyInput.Shift);
return EVENT_BLOCK; // Don't propagate key up events
}
}

3
src/input/input_manager.hpp
View File

@ -69,7 +69,8 @@ private:
int m_mouse_val_x, m_mouse_val_y;
void dispatchInput(Input::InputType, int deviceID, int btnID,
Input::AxisDirection direction, int value);
Input::AxisDirection direction, int value,
bool shift_mask = false);
void handleStaticAction(int id0, int value);
void inputSensing(Input::InputType type, int deviceID, int btnID,
Input::AxisDirection axisDirection, int value);