mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Partially revert e1366361

Browse source 
This fixes a bug when creating a TextLayout with whitespace at the start of lines.
This commit is contained in:
ed 2021-08-31 10:23:47 +01:00
parent 1d38f646ab
commit 2be72f6acd
1 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

33
modules/juce_graphics/fonts/juce_TextLayout.cpp
View file

@ -354,26 +354,23 @@ namespace TextLayoutHelpers
if (newGlyphs.size() > 0)
{
if (! t.isWhitespace && ! t.isNewLine)
currentRun->glyphs.ensureStorageAllocated (currentRun->glyphs.size() + newGlyphs.size());
auto tokenOrigin = t.area.getPosition().translated (0, t.font.getAscent());
if (needToSetLineOrigin)
{
currentRun->glyphs.ensureStorageAllocated (currentRun->glyphs.size() + newGlyphs.size());
auto tokenOrigin = t.area.getPosition().translated (0, t.font.getAscent());
needToSetLineOrigin = false;
currentLine->lineOrigin = tokenOrigin;
}
if (needToSetLineOrigin)
{
needToSetLineOrigin = false;
currentLine->lineOrigin = tokenOrigin;
}
auto glyphOffset = tokenOrigin - currentLine->lineOrigin;
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));
}
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();
@ -497,7 +494,7 @@ namespace TextLayoutHelpers
for (i = 0; i < tokens.size(); ++i)
{
auto& t = *tokens.getUnchecked(i);
auto& t = *tokens.getUnchecked (i);
t.area.setPosition (x, y);
t.line = totalLines;
x += t.area.getWidth();