edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-12 19:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #5468

Browse source 
5468: Only enable UI editbox hotkeys when UI is enabled r=def- a=Robyt3

Fixes hotkeys triggering console input and UI editbox input at the same time when the console is open and a UI editbox is selected.

Closes #5467.

## Checklist

- [X] Tested the change ingame
- [ ] Provided screenshots if it is a visual change
- [ ] Tested in combination with possibly related configuration options
- [ ] Written a unit test if it works standalone, system.c especially
- [ ] Considered possible null pointers and out of bounds array indexing
- [ ] Changed no physics that affect existing maps
- [ ] Tested the change with [ASan+UBSan or valgrind's memcheck](https://github.com/ddnet/ddnet/#using-addresssanitizer--undefinedbehavioursanitizer-or-valgrinds-memcheck) (optional)


Co-authored-by: Robert Müller <robytemueller@gmail.com>
This commit is contained in:
bors[bot] 2022-06-21 16:03:47 +00:00 committed by GitHub
parent eb0d48a0eb 81e24ce8e8
commit 3d98a4b083
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/client/ui_ex.cpp
View file

@ -316,10 +316,11 @@ bool CUIEx::DoEditBox(const void *pID, const CUIRect *pRect, char *pStr, unsigne
m_CurCursor = minimum(str_length(pStr), m_CurCursor); m_CurCursor = minimum(str_length(pStr), m_CurCursor);
const bool Enabled = UI()->Enabled();
bool IsShiftPressed = Input()->KeyIsPressed(KEY_LSHIFT) || Input()->KeyIsPressed(KEY_RSHIFT); bool IsShiftPressed = Input()->KeyIsPressed(KEY_LSHIFT) || Input()->KeyIsPressed(KEY_RSHIFT);
bool IsModPressed = Input()->ModifierIsPressed(); bool IsModPressed = Input()->ModifierIsPressed();
if(!IsShiftPressed && IsModPressed && Input()->KeyPress(KEY_V)) if(Enabled && !IsShiftPressed && IsModPressed && Input()->KeyPress(KEY_V))
{ {
const char *pText = Input()->GetClipboardText(); const char *pText = Input()->GetClipboardText();
if(pText) if(pText)
@ -376,7 +377,7 @@ bool CUIEx::DoEditBox(const void *pID, const CUIRect *pRect, char *pStr, unsigne
} }
} }
if(!IsShiftPressed && IsModPressed && (Input()->KeyPress(KEY_C) || Input()->KeyPress(KEY_X))) if(Enabled && !IsShiftPressed && IsModPressed && (Input()->KeyPress(KEY_C) || Input()->KeyPress(KEY_X)))
{ {
if(m_HasSelection) if(m_HasSelection)
{ {
@ -404,12 +405,12 @@ bool CUIEx::DoEditBox(const void *pID, const CUIRect *pRect, char *pStr, unsigne
Input()->SetClipboardText(pStr); Input()->SetClipboardText(pStr);
} }
if(Properties.m_SelectText || (!IsShiftPressed && IsModPressed && Input()->KeyPress(KEY_A))) if(Properties.m_SelectText || (Enabled && !IsShiftPressed && IsModPressed && Input()->KeyPress(KEY_A)))
{ {
SelectAllText(); SelectAllText();
} }
if(!IsShiftPressed && IsModPressed && Input()->KeyPress(KEY_U)) if(Enabled && !IsShiftPressed && IsModPressed && Input()->KeyPress(KEY_U))
{ {
pStr[0] = '\0'; pStr[0] = '\0';
m_CurCursor = 0; m_CurCursor = 0;