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

Merge pull request #9258 from Robyt3/Textrender-Newline-Loop-Fix

Browse source 
Fix client hanging when rendering text with small maximum width
This commit is contained in:
Dennis Felsing 2024-11-16 21:00:42 +00:00 committed by GitHub
parent 95d6d99aff c3bcf57f99
commit 9c02194f09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/engine/client/text.cpp
View file

@ -1560,6 +1560,7 @@ public:
const char *pCurrent = pText; const char *pCurrent = pText;
const char *pEnd = pCurrent + Length; const char *pEnd = pCurrent + Length;
const char *pPrevBatchEnd = nullptr;
const char *pEllipsis = "…"; const char *pEllipsis = "…";
const SGlyph *pEllipsisGlyph = nullptr; const SGlyph *pEllipsisGlyph = nullptr;
if(pCursor->m_Flags & TEXTFLAG_ELLIPSIS_AT_END) if(pCursor->m_Flags & TEXTFLAG_ELLIPSIS_AT_END)
@ -1966,6 +1967,9 @@ public:
if(NewLine) if(NewLine)
{ {
if(pPrevBatchEnd == pBatchEnd)
break;
pPrevBatchEnd = pBatchEnd;
if(!StartNewLine()) if(!StartNewLine())
break; break;
GotNewLineLast = true; GotNewLineLast = true;