Better automatic resize for legend box

mhugent · mhugent · commit 5bf607d7f180 · 2008-09-05T14:39:43.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@9263 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -270,8 +270,8 @@ void QgsComposerLegend::drawPointSymbol( QPainter* p, QgsSymbol* s, double curre
     p->restore();
   }
 
-  currentXPosition += pointImage.width() / rasterScaleFactor;
-  symbolHeight = pointImage.height() / rasterScaleFactor;
+  currentXPosition += s->pointSize(); //pointImage.width() / rasterScaleFactor;
+  symbolHeight = s->pointSize(); //pointImage.height() / rasterScaleFactor;
 }
 
 void QgsComposerLegend::drawLineSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition ) const

Original file line number	Diff line number	Diff line change
`@@ -270,8 +270,8 @@ void QgsComposerLegend::drawPointSymbol( QPainter* p, QgsSymbol* s, double curre`
`270`	`270`	`p->restore();`
`271`	`271`	`}`
`272`	`272`
`273`		`- currentXPosition += pointImage.width() / rasterScaleFactor;`
`274`		`- symbolHeight = pointImage.height() / rasterScaleFactor;`
	`273`	`+ currentXPosition += s->pointSize(); //pointImage.width() / rasterScaleFactor;`
	`274`	`+ symbolHeight = s->pointSize(); //pointImage.height() / rasterScaleFactor;`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`void QgsComposerLegend::drawLineSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition ) const`