Browse Source

TextLayout: Skip whitespace tokens in TokenList::createLayout() to fix misalignment when using horizontally centred justification

v6.1.6
ed 3 years ago
parent
commit
e1366361ed
1 changed files with 19 additions and 20 deletions
  1. +19
    -20
      modules/juce_graphics/fonts/juce_TextLayout.cpp

+ 19
- 20
modules/juce_graphics/fonts/juce_TextLayout.cpp View File

@@ -354,31 +354,30 @@ namespace TextLayoutHelpers
if (newGlyphs.size() > 0) if (newGlyphs.size() > 0)
{ {
currentRun->glyphs.ensureStorageAllocated (currentRun->glyphs.size() + newGlyphs.size());
auto tokenOrigin = t.area.getPosition().translated (0, t.font.getAscent());
if (needToSetLineOrigin)
if (! t.isWhitespace && ! t.isNewLine)
{ {
needToSetLineOrigin = false;
currentLine->lineOrigin = tokenOrigin;
}
auto glyphOffset = tokenOrigin - currentLine->lineOrigin;
for (int j = 0; j < newGlyphs.size(); ++j)
{
auto x = xOffsets.getUnchecked (j);
currentRun->glyphs.add (TextLayout::Glyph (newGlyphs.getUnchecked(j),
glyphOffset.translated (x, 0),
xOffsets.getUnchecked (j + 1) - x));
currentRun->glyphs.ensureStorageAllocated (currentRun->glyphs.size() + newGlyphs.size());
auto tokenOrigin = t.area.getPosition().translated (0, t.font.getAscent());
if (needToSetLineOrigin)
{
needToSetLineOrigin = false;
currentLine->lineOrigin = tokenOrigin;
}
auto glyphOffset = tokenOrigin - currentLine->lineOrigin;
for (int j = 0; j < newGlyphs.size(); ++j)
{
auto x = xOffsets.getUnchecked (j);
currentRun->glyphs.add (TextLayout::Glyph (newGlyphs.getUnchecked (j),
glyphOffset.translated (x, 0),
xOffsets.getUnchecked (j + 1) - x));
}
} }
charPosition += newGlyphs.size(); charPosition += newGlyphs.size();
} }
else if (t.isWhitespace || t.isNewLine)
{
++charPosition;
}
if (auto* nextToken = tokens[i + 1]) if (auto* nextToken = tokens[i + 1])
{ {


Loading…
Cancel
Save