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

Merge pull request #2940 from def-/pr-empty-lines

Browse source 
Fix empty lines in chat (fixes #1835)
This commit is contained in:
Dennis Felsing 2020-09-29 07:51:12 +02:00 committed by GitHub
parent b88b33cea4 18ad5b58c0
commit 16f965a0e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/client/components/chat.cpp
View file

@ -51,6 +51,9 @@ void CChat::OnWindowResize()
if(m_aLines[i].m_TextContainerIndex != -1)
TextRender()->DeleteTextContainer(m_aLines[i].m_TextContainerIndex);
m_aLines[i].m_TextContainerIndex = -1;
// recalculate sizes
m_aLines[i].m_YOffset[0] = -1.f;
m_aLines[i].m_YOffset[1] = -1.f;
}
}
@ -866,7 +869,8 @@ void CChat::OnPrepareLines()
TextRender()->SetCursor(&Cursor, Begin, 0.0f, FontSize, 0);
Cursor.m_LineWidth = LineWidth;
TextRender()->TextEx(&Cursor, "♥ ", -1);
if(g_Config.m_ClMessageFriend)
TextRender()->TextEx(&Cursor, "♥ ", -1);
TextRender()->TextEx(&Cursor, aName, -1);
if(m_aLines[r].m_TimesRepeated > 0)
TextRender()->TextEx(&Cursor, aCount, -1);