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

Clear console selection only when scroll position is changed

Browse source 
The selection is only cleared because it would be incorrect after scrolling, but it doesn't need to be cleared if the scroll position does not change, e.g. when pressing Home while already at the top of the backlog.
This commit is contained in:
Robert Müller 2023-12-19 20:31:18 +01:00
parent a1b603a424
commit 3e89bbb15e
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/game/client/components/console.cpp
View file

@ -278,6 +278,7 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
}
};
const int BacklogPrevLine = m_BacklogCurLine;
if(Event.m_Flags & IInput::FLAG_PRESS)
{
if(Event.m_Key == KEY_RETURN || Event.m_Key == KEY_KP_ENTER)
@ -410,24 +411,19 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
else if(Event.m_Key == KEY_PAGEUP)
{
m_BacklogCurLine += GetLinesToScroll(-1, m_LinesRendered);
m_HasSelection = false;
}
else if(Event.m_Key == KEY_PAGEDOWN)
{
m_HasSelection = false;
m_BacklogCurLine -= GetLinesToScroll(1, m_LinesRendered);
if(m_BacklogCurLine < 0)
m_BacklogCurLine = 0;
}
else if(Event.m_Key == KEY_MOUSE_WHEEL_UP)
{
m_BacklogCurLine += GetLinesToScroll(-1, 1);
m_HasSelection = false;
}
else if(Event.m_Key == KEY_MOUSE_WHEEL_DOWN)
{
m_HasSelection = false;
--m_BacklogCurLine;
if(m_BacklogCurLine < 0)
m_BacklogCurLine = 0;
@ -436,15 +432,12 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
// react to it when the input is empty
else if(Event.m_Key == KEY_HOME && m_Input.IsEmpty())
{
int Lines = GetLinesToScroll(-1, -1);
m_BacklogCurLine += Lines;
m_BacklogCurLine += GetLinesToScroll(-1, -1);
m_BacklogLastActiveLine = m_BacklogCurLine;
m_HasSelection = false;
}
else if(Event.m_Key == KEY_END && m_Input.IsEmpty())
{
m_BacklogCurLine = 0;
m_HasSelection = false;
}
else if(Event.m_Key == KEY_F && m_pGameConsole->Input()->ModifierIsPressed() && Event.m_Flags & IInput::FLAG_PRESS)
{
@ -455,6 +448,11 @@ bool CGameConsole::CInstance::OnInput(const IInput::CEvent &Event)
}
}
if(m_BacklogCurLine != BacklogPrevLine)
{
m_HasSelection = false;
}
if(!Handled)
{
Handled = m_Input.ProcessInput(Event);