[legend] Fix alignment and chopped off text of collapsed data-defined…

… size legend symbol (#9228)
qgis · Feb 22, 2019 · 17d0771 · 17d0771
1 parent 006ddf5
commit 17d0771
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/core/qgsdatadefinedsizelegend.cpp b/src/core/qgsdatadefinedsizelegend.cpp
@@ -178,16 +178,18 @@ void QgsDataDefinedSizeLegend::drawCollapsedLegend( QgsRenderContext &context, Q
     if ( w > maxTextWidth )
       maxTextWidth = w;
   }
+  // add extra width needed to handle varying rendering of font weight
+  maxTextWidth += 1;
 
   // find out size of the largest symbol
   double largestSize = classes.at( 0 ).size;
-  double outputLargestSize = context.convertToPainterUnits( largestSize, s->sizeUnit(), s->sizeMapUnitScale() );
+  int outputLargestSize = std::round( context.convertToPainterUnits( largestSize, s->sizeUnit(), s->sizeMapUnitScale() ) );
 
   // find out top Y coordinate for individual symbol sizes
   QList<int> symbolTopY;
   Q_FOREACH ( const SizeClass &c, classes )
   {
-    double outputSymbolSize = context.convertToPainterUnits( c.size, s->sizeUnit(), s->sizeMapUnitScale() );
+    int outputSymbolSize = std::round( context.convertToPainterUnits( c.size, s->sizeUnit(), s->sizeMapUnitScale() ) );
     switch ( mVAlign )
     {
       case AlignCenter:
@@ -243,7 +245,7 @@ void QgsDataDefinedSizeLegend::drawCollapsedLegend( QgsRenderContext &context, Q
   {
     s->setSize( c.size );
 
-    double outputSymbolSize = context.convertToPainterUnits( c.size, s->sizeUnit(), s->sizeMapUnitScale() );
+    int outputSymbolSize = std::round( context.convertToPainterUnits( c.size, s->sizeUnit(), s->sizeMapUnitScale() ) );
     double tx = ( outputLargestSize - outputSymbolSize ) / 2;
 
     p->save();

diff --git a/...images/data_defined_size_legend/expected_basic_bottom/expected_basic_bottom.png b/...images/data_defined_size_legend/expected_basic_bottom/expected_basic_bottom.png
diff --git a/...a/control_images/data_defined_size_legend/expected_crowded/expected_crowded.png b/...a/control_images/data_defined_size_legend/expected_crowded/expected_crowded.png
diff --git a/...end_data_defined_size_collapsed/expected_legend_data_defined_size_collapsed.png b/...end_data_defined_size_collapsed/expected_legend_data_defined_size_collapsed.png