mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-11-04 18:29:41 +01:00
Code Issues Releases Wiki Activity

Fix issues with hotkey during text inputs.

Browse source
This commit is contained in:
Nichole Mattera 2020-08-12 19:07:36 -04:00 committed by Ethan Lee
parent 76b326aac3
commit 2ddd7a96fb
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
desktop_version/src/KeyPoll.cpp
View file

@ -79,6 +79,7 @@ void KeyPoll::disabletextentry()
void KeyPoll::Poll() void KeyPoll::Poll()
{ {
bool modifierPressed = false;
SDL_Event evt; SDL_Event evt;
while (SDL_PollEvent(&evt)) while (SDL_PollEvent(&evt))
{ {
@ -94,6 +95,8 @@ void KeyPoll::Poll()
pressedbackspace = true; pressedbackspace = true;
} }
modifierPressed = keymap[SDLK_LCTRL] || keymap[SDLK_RCTRL] || keymap[SDLK_LALT] || keymap[SDLK_RALT] || keymap[SDLK_LGUI] || keymap[SDLK_RGUI];
#ifdef __APPLE__ /* OSX prefers the command keys over the alt keys. -flibit */ #ifdef __APPLE__ /* OSX prefers the command keys over the alt keys. -flibit */
bool altpressed = keymap[SDLK_LGUI] || keymap[SDLK_RGUI]; bool altpressed = keymap[SDLK_LGUI] || keymap[SDLK_RGUI];
#else #else
@ -135,7 +138,10 @@ void KeyPoll::Poll()
} }
break; break;
case SDL_TEXTINPUT: case SDL_TEXTINPUT:
keybuffer += evt.text.text; if (!modifierPressed)
{
keybuffer += evt.text.text;
}
break; break;
/* Mouse Input */ /* Mouse Input */

1
desktop_version/src/editor.cpp
View file

@ -495,6 +495,7 @@ void editorclass::getlin(const enum textmode mode, const std::string& prompt, st
ed.textmod = mode; ed.textmod = mode;
ed.textptr = ptr; ed.textptr = ptr;
ed.textdesc = prompt; ed.textdesc = prompt;
ed.textentry = true;
key.enabletextentry(); key.enabletextentry();
if (ptr) if (ptr)
{ {