[composer] Allow for finer control over text rendered with QgsComposerItem::drawText, fixes clipped text when using italic fonts in legend titles

nyalldawson · nyalldawson · commit ecf2600a4e52 · 2014-05-15T10:04:23.000+10:00
diff --git a/python/core/composer/qgscomposeritem.sip b/python/core/composer/qgscomposeritem.sip
@@ -353,8 +353,10 @@ class QgsComposerItem : QObject, QGraphicsRectItem
      to work around the Qt font bug)*/
     void drawText( QPainter* p, double x, double y, const QString& text, const QFont& font ) const;
 
-    /**Like the above, but with a rectangle for multiline text*/
-    void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment = Qt::AlignLeft, Qt::AlignmentFlag valignment = Qt::AlignTop ) const;
+    /**Like the above, but with a rectangle for multiline text
+     * @param flags allows for passing Qt::TextFlags to control appearance of rendered text    
+    */
+    void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment = Qt::AlignLeft, Qt::AlignmentFlag valignment = Qt::AlignTop, int flags = Qt::TextWordWrap ) const;
 
     /**Returns the font width in millimeters (considers upscaling and downscaling with FONT_WORKAROUND_SCALE*/
     double textWidthMillimeters( const QFont& font, const QString& text ) const;
diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp
@@ -619,7 +619,7 @@ void QgsComposerItem::drawText( QPainter* p, double x, double y, const QString&
   p->restore();
 }
 
-void QgsComposerItem::drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment, Qt::AlignmentFlag valignment ) const
+void QgsComposerItem::drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment, Qt::AlignmentFlag valignment, int flags ) const
 {
   QFont textFont = scaledFontPixelSize( font );
 
@@ -630,7 +630,7 @@ void QgsComposerItem::drawText( QPainter* p, const QRectF& rect, const QString&
   p->setFont( textFont );
   double scaleFactor = 1.0 / FONT_WORKAROUND_SCALE;
   p->scale( scaleFactor, scaleFactor );
-  p->drawText( scaledRect, halignment | valignment | Qt::TextWordWrap, text );
+  p->drawText( scaledRect, halignment | valignment | flags, text );
   p->restore();
 }
 void QgsComposerItem::drawArrowHead( QPainter* p, double x, double y, double angle, double arrowHeadWidth ) const
diff --git a/src/core/composer/qgscomposeritem.h b/src/core/composer/qgscomposeritem.h
@@ -313,8 +313,10 @@ class CORE_EXPORT QgsComposerItem: public QObject, public QGraphicsRectItem
      to work around the Qt font bug)*/
     void drawText( QPainter* p, double x, double y, const QString& text, const QFont& font ) const;
 
-    /**Like the above, but with a rectangle for multiline text*/
-    void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment = Qt::AlignLeft, Qt::AlignmentFlag valignment = Qt::AlignTop ) const;
+    /**Like the above, but with a rectangle for multiline text
+     * @param flags allows for passing Qt::TextFlags to control appearance of rendered text
+    */
+    void drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment = Qt::AlignLeft, Qt::AlignmentFlag valignment = Qt::AlignTop, int flags = Qt::TextWordWrap ) const;
 
     /**Returns the font width in millimeters (considers upscaling and downscaling with FONT_WORKAROUND_SCALE*/
     double textWidthMillimeters( const QFont& font, const QString& text ) const;
diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp
@@ -152,7 +152,7 @@ void QgsComposerLabel::paint( QPainter* painter, const QStyleOptionGraphicsItem*
     //debug
     //painter->setPen( QColor( Qt::red ) );
     //painter->drawRect( painterRect );
-    drawText( painter, painterRect, textToDraw, mFont, mHAlignment, mVAlignment );
+    drawText( painter, painterRect, textToDraw, mFont, mHAlignment, mVAlignment, Qt::TextWordWrap );
   }
 
   painter->restore();
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -249,7 +249,7 @@ QSizeF QgsComposerLegend::drawTitle( QPainter* painter, QPointF point, Qt::Align
 
     if ( painter )
     {
-      drawText( painter, r, *titlePart, styleFont( QgsComposerLegendStyle::Title ), halignment, Qt::AlignVCenter );
+      drawText( painter, r, *titlePart, styleFont( QgsComposerLegendStyle::Title ), halignment, Qt::AlignVCenter, Qt::TextDontClip );
     }
 
     //update max width of title

Original file line number	Diff line number	Diff line change
`@@ -619,7 +619,7 @@ void QgsComposerItem::drawText( QPainter* p, double x, double y, const QString&`
`619`	`619`	`p->restore();`
`620`	`620`	`}`
`621`	`621`
`622`		`-void QgsComposerItem::drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment, Qt::AlignmentFlag valignment ) const`
	`622`	`+void QgsComposerItem::drawText( QPainter* p, const QRectF& rect, const QString& text, const QFont& font, Qt::AlignmentFlag halignment, Qt::AlignmentFlag valignment, int flags ) const`
`623`	`623`	`{`
`624`	`624`	`QFont textFont = scaledFontPixelSize( font );`
`625`	`625`
`@@ -630,7 +630,7 @@ void QgsComposerItem::drawText( QPainter* p, const QRectF& rect, const QString&`
`630`	`630`	`p->setFont( textFont );`
`631`	`631`	`double scaleFactor = 1.0 / FONT_WORKAROUND_SCALE;`
`632`	`632`	`p->scale( scaleFactor, scaleFactor );`
`633`		`- p->drawText( scaledRect, halignment \| valignment \| Qt::TextWordWrap, text );`
	`633`	`+ p->drawText( scaledRect, halignment \| valignment \| flags, text );`
`634`	`634`	`p->restore();`
`635`	`635`	`}`
`636`	`636`	`void QgsComposerItem::drawArrowHead( QPainter* p, double x, double y, double angle, double arrowHeadWidth ) const`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ void QgsComposerLabel::paint( QPainter* painter, const QStyleOptionGraphicsItem*`
`152`	`152`	`//debug`
`153`	`153`	`//painter->setPen( QColor( Qt::red ) );`
`154`	`154`	`//painter->drawRect( painterRect );`
`155`		`- drawText( painter, painterRect, textToDraw, mFont, mHAlignment, mVAlignment );`
	`155`	`+ drawText( painter, painterRect, textToDraw, mFont, mHAlignment, mVAlignment, Qt::TextWordWrap );`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`painter->restore();`
Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ QSizeF QgsComposerLegend::drawTitle( QPainter* painter, QPointF point, Qt::Align`
`249`	`249`
`250`	`250`	`if ( painter )`
`251`	`251`	`{`
`252`		`- drawText( painter, r, *titlePart, styleFont( QgsComposerLegendStyle::Title ), halignment, Qt::AlignVCenter );`
	`252`	`+ drawText( painter, r, *titlePart, styleFont( QgsComposerLegendStyle::Title ), halignment, Qt::AlignVCenter, Qt::TextDontClip );`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`//update max width of title`