Skip to content

Fix #557: zalgo chat messages spill over #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 27, 2019
Merged

Fix #557: zalgo chat messages spill over #885

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions Client/core/CChat.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,18 +252,17 @@ void CChat::DrawDrawList(const SDrawList& drawList, const CVector2D& topLeftOffs
CVector2D chatTopLeft(drawList.renderBounds.fX1, drawList.renderBounds.fY1);
CVector2D chatBotRight(drawList.renderBounds.fX2, drawList.renderBounds.fY2);
CVector2D chatSize = chatBotRight - chatTopLeft;
CRect2D chatBounds(0, 0, chatSize.fX, chatSize.fY);

chatBounds.fX1 += topLeftOffset.fX;
chatBounds.fY1 += topLeftOffset.fY;
chatBounds.fX2 += topLeftOffset.fX;
chatBounds.fY2 += topLeftOffset.fY;
float fRight = topLeftOffset.fX + chatSize.fX;
float fLineHeight = CChat::GetFontHeight(g_pChat->m_vecScale.fY);

CGraphics::GetSingleton().BeginDrawBatch();

for (const auto& item : drawList.lineItemList)
{
m_Lines[item.uiLine].Draw(item.vecPosition - chatTopLeft + topLeftOffset, item.ucAlpha, drawList.bShadow, drawList.bOutline, chatBounds);
CVector2D vecPosition = item.vecPosition - chatTopLeft + topLeftOffset;
CRect2D chatBounds(vecPosition.fX, vecPosition.fY, fRight, vecPosition.fY + fLineHeight);
m_Lines[item.uiLine].Draw(vecPosition, item.ucAlpha, drawList.bShadow, drawList.bOutline, chatBounds);
}

CGraphics::GetSingleton().EndDrawBatch();
Expand Down Expand Up @@ -975,14 +974,14 @@ void CChat::DrawTextString(const char* szText, CRect2D DrawArea, float fZ, CRect
fScaleX *= g_pChat->m_fRcpUsingDxFontScale;
fScaleY *= g_pChat->m_fRcpUsingDxFontScale;

if (DrawArea.fY1 < RenderBounds.fY1)
if (DrawArea.fY1 <= RenderBounds.fY1)
{
// Clip text at the top
if (DrawArea.fY1 + fLineHeight - RenderBounds.fY1 > 1)
g_pCore->GetGraphics()->DrawString((int)DrawArea.fX1, (int)RenderBounds.fY1, (int)DrawArea.fX2, (int)DrawArea.fY1 + fLineHeight, ulColor,
szText, fScaleX, fScaleY, DT_LEFT | DT_BOTTOM | DT_SINGLELINE, g_pChat->m_pDXFont, bOutline);
}
else if (DrawArea.fY1 + fLineHeight > RenderBounds.fY2)
else if (DrawArea.fY1 + fLineHeight >= RenderBounds.fY2)
{
// Clip text at the bottom
if (RenderBounds.fY2 - DrawArea.fY1 > 1)
Expand Down