Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 05:27:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

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

7
client/src/main.c
View File

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