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

editor: allow non-conflicting keybinds while line input is active

Browse source
This commit is contained in:
dobrykafe 2024-09-18 23:15:09 +02:00
parent 217103a0ee
commit 9e8dfc720a
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/game/editor/editor.cpp
View file

@ -7827,11 +7827,21 @@ void CEditor::Render()
else if(m_Mode == MODE_SOUNDS) else if(m_Mode == MODE_SOUNDS)
DoToolbarSounds(ToolBar); DoToolbarSounds(ToolBar);
if(m_Dialog == DIALOG_NONE && CLineInput::GetActiveInput() == nullptr) if(m_Dialog == DIALOG_NONE)
{ {
const bool ModPressed = Input()->ModifierIsPressed(); const bool ModPressed = Input()->ModifierIsPressed();
const bool ShiftPressed = Input()->ShiftIsPressed(); const bool ShiftPressed = Input()->ShiftIsPressed();
const bool AltPressed = Input()->AltIsPressed(); const bool AltPressed = Input()->AltIsPressed();
if(CLineInput::GetActiveInput() == nullptr)
{
// ctrl+a to append map
if(Input()->KeyPress(KEY_A) && ModPressed)
{
InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Append map", "Append", "maps", false, CallbackAppendMap, this);
}
}
// ctrl+n to create new map // ctrl+n to create new map
if(Input()->KeyPress(KEY_N) && ModPressed) if(Input()->KeyPress(KEY_N) && ModPressed)
{ {
@ -7849,11 +7859,6 @@ void CEditor::Render()
m_aFileName[0] = 0; m_aFileName[0] = 0;
} }
} }
// ctrl+a to append map
if(Input()->KeyPress(KEY_A) && ModPressed)
{
InvokeFileDialog(IStorage::TYPE_ALL, FILETYPE_MAP, "Append map", "Append", "maps", false, CallbackAppendMap, this);
}
// ctrl+o or ctrl+l to open // ctrl+o or ctrl+l to open
if((Input()->KeyPress(KEY_O) || Input()->KeyPress(KEY_L)) && ModPressed) if((Input()->KeyPress(KEY_O) || Input()->KeyPress(KEY_L)) && ModPressed)
{ {