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

Fix for TextLayout justification.

Browse source
This commit is contained in:
jules 2012-10-10 11:44:23 +01:00
parent 10c0894141
commit dbf0aced62
1 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -173,10 +173,10 @@ TextLayout::~TextLayout()
float TextLayout::getHeight() const noexcept
{
const Line* const lastLine = lines.getLast();
if (const Line* const lastLine = lines.getLast())
return lastLine->lineOrigin.y + lastLine->descent;
return lastLine != nullptr ? lastLine->lineOrigin.y + lastLine->descent
: 0;
return 0.0f;
}
TextLayout::Line& TextLayout::getLine (const int index) const
@ -238,7 +238,7 @@ namespace TextLayoutHelpers
{
struct FontAndColour
{
FontAndColour (const Font* font_) noexcept : font (font_), colour (0xff000000) {}
FontAndColour (const Font* f) noexcept : font (f), colour (0xff000000) {}
const Font* font;
Colour colour;
@ -251,8 +251,8 @@ namespace TextLayoutHelpers
struct RunAttribute
{
RunAttribute (const FontAndColour& fontAndColour_, const Range<int>& range_) noexcept
: fontAndColour (fontAndColour_), range (range_)
RunAttribute (const FontAndColour& fc, const Range<int>& r) noexcept
: fontAndColour (fc), range (r)
{}
FontAndColour fontAndColour;
@ -261,10 +261,10 @@ namespace TextLayoutHelpers
struct Token
{
Token (const String& t, const Font& f, const Colour& c, const bool isWhitespace_)
Token (const String& t, const Font& f, const Colour& c, const bool whitespace)
: text (t), font (f), colour (c),
area (font.getStringWidthFloat (t), f.getHeight()),
isWhitespace (isWhitespace_),
isWhitespace (whitespace),
isNewLine (t.containsChar ('\n') || t.containsChar ('\r'))
{}
@ -385,7 +385,7 @@ namespace TextLayoutHelpers
for (int i = 0; i < layout.getNumLines(); ++i)
{
float dx = totalW - getLineWidth (i);
float dx = totalW - layout.getLine(i).getLineBoundsX().getLength();
if (isCentred)
dx /= 2.0f;
@ -499,21 +499,6 @@ namespace TextLayoutHelpers
}
}
float getLineWidth (const int lineNumber) const noexcept
{
float maxW = 0;
for (int i = tokens.size(); --i >= 0;)
{
const Token& t = *tokens.getUnchecked (i);
if (t.line == lineNumber && ! t.isWhitespace)
maxW = jmax (maxW, t.area.getRight());
}
return maxW;
}
void addTextRuns (const AttributedString& text)
{
Font defaultFont;