[QGIS Commit] r9265 - trunk/qgis/src/core/composer

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2008-09-05 11:29:13 -0400 (Fri, 05 Sep 2008)
New Revision: 9265

Modified:
   trunk/qgis/src/core/composer/qgscomposeritem.cpp
Log:
Fix for font colors changing after polygon layers (ticket 1294)

Modified: trunk/qgis/src/core/composer/qgscomposeritem.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposeritem.cpp	2008-09-05 14:59:46 UTC (rev 9264)
+++ trunk/qgis/src/core/composer/qgscomposeritem.cpp	2008-09-05 15:29:13 UTC (rev 9265)
@@ -529,6 +529,7 @@
   
   p->save();
   p->setFont(textFont);
+  p->setPen(QColor(0, 0, 0)); //draw text always in black
   double scaleFactor = 1.0 / FONT_WORKAROUND_SCALE;
   p->scale(scaleFactor, scaleFactor);
   p->drawText(x * FONT_WORKAROUND_SCALE, y * FONT_WORKAROUND_SCALE, text);
@@ -544,6 +545,7 @@
 
   p->save();
   p->setFont(textFont);
+  p->setPen(QColor(0, 0, 0)); //draw text always in black
   double scaleFactor = 1.0 / FONT_WORKAROUND_SCALE;
   p->scale(scaleFactor, scaleFactor);
   p->drawText(scaledRect, Qt::AlignLeft | Qt::AlignTop | Qt::TextWordWrap, text);