From af35baccf5727dbed904c074e19e1b5fca1ced22 Mon Sep 17 00:00:00 2001 From: James Hurst Date: Tue, 21 Aug 2018 09:28:36 +0100 Subject: [PATCH] Allowed different text justifications in drawMultiLineText --- modules/juce_graphics/contexts/juce_GraphicsContext.cpp | 5 +++-- modules/juce_graphics/contexts/juce_GraphicsContext.h | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/juce_graphics/contexts/juce_GraphicsContext.cpp b/modules/juce_graphics/contexts/juce_GraphicsContext.cpp index fe9910e0b3..1c43b9a277 100644 --- a/modules/juce_graphics/contexts/juce_GraphicsContext.cpp +++ b/modules/juce_graphics/contexts/juce_GraphicsContext.cpp @@ -273,7 +273,8 @@ void Graphics::drawSingleLineText (const String& text, const int startX, const i } void Graphics::drawMultiLineText (const String& text, const int startX, - const int baselineY, const int maximumLineWidth) const + const int baselineY, const int maximumLineWidth, + Justification justification) const { if (text.isNotEmpty() && startX < context.getClipBounds().getRight()) @@ -281,7 +282,7 @@ void Graphics::drawMultiLineText (const String& text, const int startX, GlyphArrangement arr; arr.addJustifiedText (context.getFont(), text, (float) startX, (float) baselineY, (float) maximumLineWidth, - Justification::left); + justification); arr.draw (*this); } } diff --git a/modules/juce_graphics/contexts/juce_GraphicsContext.h b/modules/juce_graphics/contexts/juce_GraphicsContext.h index 570fe8a1a8..50f517b5f2 100644 --- a/modules/juce_graphics/contexts/juce_GraphicsContext.h +++ b/modules/juce_graphics/contexts/juce_GraphicsContext.h @@ -145,7 +145,8 @@ public: */ void drawMultiLineText (const String& text, int startX, int baselineY, - int maximumLineWidth) const; + int maximumLineWidth, + Justification justification = Justification::left) const; /** Draws a line of text within a specified rectangle.