AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 18:15:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

GUIs that grab input should always prevent all normal actions

Browse Source
This commit is contained in:
UnknownShadow200 2024-05-29 17:48:49 +10:00
parent 245d470a39
commit 8c014a5d26
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Input.c
View File

@ -1151,8 +1151,6 @@ static void InputHandler_CheckZoomFov(void* obj) {
} }
static cc_bool HandleBlockKey(int key) { static cc_bool HandleBlockKey(int key) {
if (Gui.InputGrab) return false;
if (InputBind_Claims(BIND_DELETE_BLOCK, key)) { if (InputBind_Claims(BIND_DELETE_BLOCK, key)) {
MouseStatePress(MOUSE_LEFT); MouseStatePress(MOUSE_LEFT);
InputHandler_DeleteBlock(); InputHandler_DeleteBlock();
@ -1330,8 +1328,9 @@ static void OnInputDown(void* obj, int key, cc_bool was) {
s->dirty = true; s->dirty = true;
if (s->VTABLE->HandlesInputDown(s, key)) return; if (s->VTABLE->HandlesInputDown(s, key)) return;
} }
if (Gui.InputGrab) return;
if (Input_IsPauseButton(key) && !Gui.InputGrab) { if (Input_IsPauseButton(key)) {
#ifdef CC_BUILD_WEB #ifdef CC_BUILD_WEB
/* Can't do this in KeyUp, because pressing escape without having */ /* Can't do this in KeyUp, because pressing escape without having */
/* explicitly disabled mouse lock means a KeyUp event isn't sent. */ /* explicitly disabled mouse lock means a KeyUp event isn't sent. */