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

GlyphArrangement: Extend glyph bounds to encapsulate ligature characters

Browse source 
Previously, bounds for text with ligatures were miscalculated, leading to
incorrect positioning and getStringWidth values.
This commit is contained in:
Oliver James 2025-06-17 21:41:31 +01:00 • committed by Oli
parent ae8ca6120f
commit fc80bb29ca
1 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

48
modules/juce_graphics/fonts/juce_GlyphArrangement.cpp
View file

@ -188,28 +188,40 @@ void GlyphArrangement::addLineOfText (const Font& font, const String& text, floa
static void addGlyphsFromShapedText (GlyphArrangement& ga, const detail::ShapedText& st, float x, float y)
{
st.accessTogetherWith ([&] (auto shapedGlyphs, auto positions, auto font, auto glyphRange, auto)
{
for (size_t i = 0; i < shapedGlyphs.size(); ++i)
{
const auto glyphIndex = (int64) i + glyphRange.getStart();
{
for (auto it = shapedGlyphs.begin(); it != shapedGlyphs.end();)
{
const auto& glyph = *it;
const auto isNotPlaceholder = [] (auto& shapedGlyph)
{
return ! shapedGlyph.isPlaceholderForLigature();
};
auto& glyph = shapedGlyphs[i];
auto& position = positions[i];
const auto next = std::find_if (std::next (it),
shapedGlyphs.end(),
isNotPlaceholder);
if (glyph.isPlaceholderForLigature())
continue;
const auto addWidth = [] (auto acc, auto& shapedGlyph)
{
return acc + shapedGlyph.advance.x;
};
PositionedGlyph pg { font,
st.getText()[(int) st.getTextRange (glyphIndex).getStart()],
(int) glyph.glyphId,
position.getX() + x,
position.getY() + y,
glyph.advance.getX(),
glyph.isWhitespace() };
const auto width = std::accumulate (it, next, 0.0f, addWidth);
const auto index = (size_t) std::distance (shapedGlyphs.begin(), it);
const auto position = positions[index];
const auto glyphIndex = (int64) index + glyphRange.getStart();
ga.addGlyph (std::move (pg));
}
});
ga.addGlyph ({ font,
st.getText()[(int) st.getTextRange (glyphIndex).getStart()],
(int) glyph.glyphId,
position.getX() + x,
position.getY() + y,
width,
glyph.isWhitespace() });
it = next;
}
});
}
void GlyphArrangement::addCurtailedLineOfText (const Font& font, const String& text,