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

SimpleShapedText: Avoid wrapping when WordWrap::none is requested

Browse source
This commit is contained in:
reuk 2024-07-11 17:59:03 +01:00
parent b3fdcdc928
commit b35688d9a4
No known key found for this signature in database
GPG key ID: FCB43929F012EE5C
2 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
modules/juce_graphics/fonts/juce_SimpleShapedText.cpp
View file

@ -1032,6 +1032,8 @@ void SimpleShapedText::shape (const String& data,
std::optional<BestMatch> bestMatch;
static constexpr auto floatMax = std::numeric_limits<float>::max();
for (auto breakBefore = softBreakIterator.next();
breakBefore.has_value() && (lineNumbers.size() == 0
|| (int64) lineNumbers.size() < options.getMaxNumLines() - 1);
@ -1040,8 +1042,8 @@ void SimpleShapedText::shape (const String& data,
if (auto safeAdvance = glyphsToConsume.getAdvanceXUpToBreakPointIfSafe (*breakBefore,
options.getTrailingWhitespacesShouldFit()))
{
if (safeAdvance->maybeIgnoringWhitespace < remainingWidth || ! bestMatch.has_value())
bestMatch = BestMatch { *breakBefore, *safeAdvance, false, std::vector<ShapedGlyph> {} };
if (safeAdvance->maybeIgnoringWhitespace < remainingWidth.value_or (floatMax) || ! bestMatch.has_value())
bestMatch = BestMatch { *breakBefore, *safeAdvance, false, std::vector<ShapedGlyph>{} };
else
break; // We found a safe break that is too large to fit. Anything beyond
// this point would be too large to fit.
@ -1076,7 +1078,7 @@ void SimpleShapedText::shape (const String& data,
float {},
[] (auto acc, const auto& elem) { return acc + elem.advance.getX(); });
if (advance < remainingWidth || ! bestMatch.has_value())
if (advance < remainingWidth.value_or (floatMax) || ! bestMatch.has_value())
bestMatch = BestMatch { *breakBefore, { advance, advance }, true, std::move (glyphs) };
}
}
@ -1120,7 +1122,7 @@ void SimpleShapedText::shape (const String& data,
glyphsToConsume.breakBeforeAndConsume (bestMatch->breakBefore);
};
if (bestMatch->advance.maybeIgnoringWhitespace >= remainingWidth)
if (bestMatch->advance.maybeIgnoringWhitespace >= remainingWidth.value_or (floatMax))
{
// Even an empty line is too short to fit any of the text
if (numGlyphsInLine == 0 && exactlyEqual (remainingWidth, options.getMaxWidth()))

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

@ -417,12 +417,16 @@ void TextLayout::createStandardLayout (const AttributedString& text)
colours.set (range, attribute.colour);
}
ShapedText shapedText { text.getText(), ShapedTextOptions{}.withFontsForRange (getFontsForRange (fonts))
.withMaxWidth (width)
.withLanguage (SystemStats::getUserLanguage())
.withTrailingWhitespacesShouldFit (false)
.withJustification (justification)
.withReadingDirection (getTextDirection (text)) };
auto shapedTextOptions = ShapedTextOptions{}.withFontsForRange (getFontsForRange (fonts))
.withLanguage (SystemStats::getUserLanguage())
.withTrailingWhitespacesShouldFit (false)
.withJustification (justification)
.withReadingDirection (getTextDirection (text));
if (text.getWordWrap() != AttributedString::none)
shapedTextOptions = shapedTextOptions.withMaxWidth (width);
ShapedText shapedText { text.getText(), shapedTextOptions };
std::optional<int64> lastLineNumber;
std::unique_ptr<Line> line;