mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix corelation between text setOutlineThickness() and getLocalBounds()

Browse Source 
This fixes text crawling explained in issue #2129
This commit is contained in:
Radek Dutkiewicz 2022-07-19 01:19:25 +01:00 committed by Lukas Dürrenberger
parent 2bca810025
commit 2db12350e7
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/SFML/Graphics/Text.cpp
View File

@ -500,19 +500,8 @@ void Text::ensureGeometryUpdate() const
{ {
const Glyph& glyph = m_font->getGlyph(curChar, m_characterSize, isBold, m_outlineThickness); const Glyph& glyph = m_font->getGlyph(curChar, m_characterSize, isBold, m_outlineThickness);
float left = glyph.bounds.left;
float top = glyph.bounds.top;
float right = glyph.bounds.left + glyph.bounds.width;
float bottom = glyph.bounds.top + glyph.bounds.height;
// Add the outline glyph to the vertices // Add the outline glyph to the vertices
addGlyphQuad(m_outlineVertices, Vector2f(x, y), m_outlineColor, glyph, italicShear); addGlyphQuad(m_outlineVertices, Vector2f(x, y), m_outlineColor, glyph, italicShear);
// Update the current bounds with the outlined glyph bounds
minX = std::min(minX, x + left - italicShear * bottom);
maxX = std::max(maxX, x + right - italicShear * top);
minY = std::min(minY, y + top);
maxY = std::max(maxY, y + bottom);
} }
// Extract the current glyph's description // Extract the current glyph's description
@ -521,24 +510,31 @@ void Text::ensureGeometryUpdate() const
// Add the glyph to the vertices // Add the glyph to the vertices
addGlyphQuad(m_vertices, Vector2f(x, y), m_fillColor, glyph, italicShear); addGlyphQuad(m_vertices, Vector2f(x, y), m_fillColor, glyph, italicShear);
// Update the current bounds with the non outlined glyph bounds // Update the current bounds
if (m_outlineThickness == 0) float left = glyph.bounds.left;
{ float top = glyph.bounds.top;
float left = glyph.bounds.left; float right = glyph.bounds.left + glyph.bounds.width;
float top = glyph.bounds.top; float bottom = glyph.bounds.top + glyph.bounds.height;
float right = glyph.bounds.left + glyph.bounds.width;
float bottom = glyph.bounds.top + glyph.bounds.height;
minX = std::min(minX, x + left - italicShear * bottom); minX = std::min(minX, x + left - italicShear * bottom);
maxX = std::max(maxX, x + right - italicShear * top); maxX = std::max(maxX, x + right - italicShear * top);
minY = std::min(minY, y + top); minY = std::min(minY, y + top);
maxY = std::max(maxY, y + bottom); maxY = std::max(maxY, y + bottom);
}
// Advance to the next character // Advance to the next character
x += glyph.advance + letterSpacing; x += glyph.advance + letterSpacing;
} }
// If we're using outline, update the current bounds
if (m_outlineThickness != 0)
{
float outline = std::abs(std::ceil(m_outlineThickness));
minX -= outline;
maxX += outline;
minY -= outline;
maxY += outline;
}
// If we're using the underlined style, add the last line // If we're using the underlined style, add the last line
if (isUnderlined && (x > 0)) if (isUnderlined && (x > 0))
{ {