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 #3079

Browse source 
3079: Reset renderflags directly after use r=def- a=Jupeyy

created by 5ebabe2ece 

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
This commit is contained in:
bors[bot] 2020-10-12 16:20:23 +00:00 committed by GitHub
parent fedb031250 2d88d44b07
commit 8f65839f4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1102,10 +1102,6 @@ public:
if(!pFont)
return -1;
int OldRenderFlags = m_RenderFlags;
if(pCursor->m_LineWidth <= 0)
SetRenderFlags(OldRenderFlags | ETextRenderFlags::TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE);
int ContainerIndex = GetFreeTextContainerIndex();
STextContainer &TextContainer = GetTextContainer(ContainerIndex);
TextContainer.m_pFont = pFont;
@ -1135,7 +1131,11 @@ public:
TextContainer.m_Flags = pCursor->m_Flags;
int OldRenderFlags = m_RenderFlags;
if(pCursor->m_LineWidth <= 0)
SetRenderFlags(OldRenderFlags | ETextRenderFlags::TEXT_RENDER_FLAG_NO_FIRST_CHARACTER_X_BEARING | ETextRenderFlags::TEXT_RENDER_FLAG_NO_LAST_CHARACTER_ADVANCE);
TextContainer.m_RenderFlags = m_RenderFlags;
SetRenderFlags(OldRenderFlags);
// same with size
ActualSize = (int)(Size * FakeToScreenY);
@ -1178,7 +1178,6 @@ public:
TextContainer.m_UnscaledFontSize = pCursor->m_FontSize;
}
SetRenderFlags(OldRenderFlags);
return ContainerIndex;
}