[client] main: better UX with the escape key combinations

This commit is contained in:
Geoffrey McRae 2019-05-23 20:31:01 +10:00
parent 196b27ee9c
commit bffd02b8c7
2 changed files with 5 additions and 4 deletions

View File

@ -1 +1 @@
a12-228-gff08540fd3+1
a12-229-g196b27ee9c+1

View File

@ -681,7 +681,7 @@ int eventFilter(void * userdata, SDL_Event * event)
if (sc == params.escapeKey)
{
state.escapeActive = true;
state.escapeAction = sc;
state.escapeAction = -1;
break;
}
@ -716,7 +716,7 @@ int eventFilter(void * userdata, SDL_Event * event)
SDL_Scancode sc = event->key.keysym.scancode;
if (state.escapeActive)
{
if (state.escapeAction == params.escapeKey)
if (state.escapeAction == -1)
{
if (params.useSpiceInput)
{
@ -742,7 +742,8 @@ int eventFilter(void * userdata, SDL_Event * event)
handle->callback(sc, handle->opaque);
}
state.escapeActive = false;
if (sc == params.escapeKey)
state.escapeActive = false;
}
if (state.ignoreInput || !params.useSpiceInput)