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

Use detail::RangedValues<Font> on ShapedText related interfaces

Browse source 
Previously using the FontForRange type was motivated by hiding the
RangedValues type in case we wanted to expose the ShapedText API. This
introduced unnecessary conversions between FontForRange and
RangedValues<Font>.
This commit is contained in:
attila 2025-01-28 17:58:24 +01:00 • committed by Attila Szarvas
parent ad43702e88
commit ef840b7472
3 changed files with 28 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -325,23 +325,6 @@ static auto castTo (const Range<U>& r)
return Range<T> (static_cast<T> (r.getStart()), static_cast<T> (r.getEnd()));
}
static auto getFontsForRange (const detail::RangedValues<Font>& fonts)
{
using namespace detail;
std::vector<FontForRange> result;
result.reserve (fonts.size());
std::transform (fonts.begin(),
fonts.end(),
std::back_inserter (result),
[] (auto entry) {
return FontForRange { entry.range, entry.value };
});
return result;
}
static Range<int64> getInputRange (const detail::ShapedText& st, Range<int64> glyphRange)
{
if (glyphRange.isEmpty())
@ -425,7 +408,7 @@ void TextLayout::createStandardLayout (const AttributedString& text)
colours.set (range, attribute.colour);
}
auto shapedTextOptions = ShapedTextOptions{}.withFontsForRange (getFontsForRange (fonts))
auto shapedTextOptions = ShapedTextOptions{}.withFonts (fonts)
.withLanguage (SystemStats::getUserLanguage())
.withTrailingWhitespacesShouldFit (false)
.withJustification (justification)