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

Fix escape not working in settings menu anymore

Browse source 
The color picker was always consuming the escape hotkey even when already disabled. Regression from #6705 due to changed order of hotkey consumption.
This commit is contained in:
Robert Müller 2023-06-05 16:56:07 +02:00
parent 3524a8f0d2
commit 6aa03c878e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/game/client/components/menus.cpp
View file

@ -1072,15 +1072,16 @@ bool CMenus::CanDisplayWarning()
void CMenus::RenderColorPicker() void CMenus::RenderColorPicker()
{ {
if(!ms_ColorPicker.m_Active)
return;
if(UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE)) if(UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
{ {
ms_ColorPicker.m_Active = false; ms_ColorPicker.m_Active = false;
ms_ValueSelectorTextMode = false; ms_ValueSelectorTextMode = false;
UI()->SetActiveItem(nullptr); UI()->SetActiveItem(nullptr);
}
if(!ms_ColorPicker.m_Active)
return; return;
}
// First check if we should disable color picker // First check if we should disable color picker
CUIRect PickerRect; CUIRect PickerRect;