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

Add ShapedText::accessTogetherWith and remove ShapedText::access

Browse source 
Since the original function template has been exposed, we can now use it
directly. Also ShapedText::Detail has been removed, because it wouldn't
work across module boundaries.
This commit is contained in:
attila 2025-01-28 17:55:30 +01:00 • committed by Attila Szarvas
parent 1b595311d0
commit fab1de34ab
6 changed files with 77 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

32
modules/juce_graphics/detail/juce_JustifiedText.cpp
View file

@ -214,8 +214,8 @@ static float getCrossAxisStartingAnchor (Justification justification,
return minimumTop;
}
JustifiedText::JustifiedText (const SimpleShapedText& t, const ShapedTextOptions& options)
: shapedText (t)
JustifiedText::JustifiedText (const SimpleShapedText* t, const ShapedTextOptions& options)
: shapedText (*t)
{
const auto leading = options.getLeading() - 1.0f;
@ -443,32 +443,26 @@ JustifiedText::JustifiedText (const SimpleShapedText& t, const ShapedTextOptions
realign.extraWhitespaceAdvance);
}
template <typename Callable>
void JustifiedText::access (Callable&& callback) const
{
accessTogetherWith (std::forward<Callable> (callback));
}
void drawJustifiedText (const JustifiedText& text, const Graphics& g, AffineTransform transform)
{
auto& context = g.getInternalContext();
context.saveState();
const ScopeGuard restoreGraphicsContext { [&context] { context.restoreState(); } };
text.access ([&] (auto glyphs, auto positions, auto font, auto, auto)
{
if (context.getFont() != font)
context.setFont (font);
text.accessTogetherWith ([&] (auto glyphs, auto positions, auto font, auto, auto)
{
if (context.getFont() != font)
context.setFont (font);
std::vector<uint16_t> glyphIds (glyphs.size());
std::vector<uint16_t> glyphIds (glyphs.size());
std::transform (glyphs.begin(),
glyphs.end(),
glyphIds.begin(),
[] (auto& glyph) { return (uint16_t) glyph.glyphId; });
std::transform (glyphs.begin(),
glyphs.end(),
glyphIds.begin(),
[] (auto& glyph) { return (uint16_t) glyph.glyphId; });
context.drawGlyphs (glyphIds, positions, transform);
});
context.drawGlyphs (glyphIds, positions, transform);
});
}
} // namespace juce::detail