mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-22 09:39:43 +01:00
Code Issues Releases Wiki Activity

Recompute textboxes on active input device change

Browse source 
This fixes a bug where some text boxes wouldn't update the displayed
button if the active input device changed from a keyboard to controller,
or vice versa. Namely, the "Press ACTION to continue" text boxes.
This commit is contained in:
Misa 2024-01-21 15:49:16 -08:00 committed by Misa Elizabeth Kai
parent 505956ae83
commit 861f724d90
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
desktop_version/src/KeyPoll.cpp
View file

@ -153,6 +153,9 @@ void KeyPoll::Poll(void)
bool fullscreenkeybind = false; bool fullscreenkeybind = false;
SDL_GameController *controller = NULL; SDL_GameController *controller = NULL;
SDL_Event evt; SDL_Event evt;
bool should_recompute_textboxes = false;
bool active_input_device_changed = false;
bool keyboard_was_active = BUTTONGLYPHS_keyboard_is_active();
while (SDL_PollEvent(&evt)) while (SDL_PollEvent(&evt))
{ {
switch (evt.type) switch (evt.type)
@ -206,7 +209,7 @@ void KeyPoll::Poll(void)
loc::loadtext(false); loc::loadtext(false);
graphics.grphx.init_translations(); graphics.grphx.init_translations();
recomputetextboxes(); should_recompute_textboxes = true;
} }
} }
else else
@ -514,6 +517,13 @@ void KeyPoll::Poll(void)
mousex = raw_mousex; mousex = raw_mousex;
mousey = raw_mousey; mousey = raw_mousey;
} }
active_input_device_changed = keyboard_was_active != BUTTONGLYPHS_keyboard_is_active();
should_recompute_textboxes |= active_input_device_changed;
if (should_recompute_textboxes)
{
recomputetextboxes();
}
} }
bool KeyPoll::isDown(SDL_Keycode key) bool KeyPoll::isDown(SDL_Keycode key)