Set larger line heights for legend text formats by default, so that w…

…e match old rendering appearance
qgis · Nov 29, 2022 · b4ecf8a · b4ecf8a
1 parent 34df6d1
commit b4ecf8a
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 0 deletions.
diff --git a/src/core/qgslegendsettings.cpp b/src/core/qgslegendsettings.cpp
@@ -37,21 +37,30 @@ QgsLegendSettings::QgsLegendSettings()
   QgsTextFormat f = rstyle( QgsLegendStyle::Title ).textFormat();
   f.setSize( 16.0 );
   f.setSizeUnit( QgsUnitTypes::RenderPoints );
+  // these default line heights are not ideal, but needed to maintain api
+  f.setLineHeight( 1.1 );
+  f.setLineHeightUnit( QgsUnitTypes::RenderPercentage );
   rstyle( QgsLegendStyle::Title ).setTextFormat( f );
 
   f = rstyle( QgsLegendStyle::Group ).textFormat();
   f.setSize( 14.0 );
   f.setSizeUnit( QgsUnitTypes::RenderPoints );
+  f.setLineHeight( 1.1 );
+  f.setLineHeightUnit( QgsUnitTypes::RenderPercentage );
   rstyle( QgsLegendStyle::Group ).setTextFormat( f );
 
   f = rstyle( QgsLegendStyle::Subgroup ).textFormat();
   f.setSize( 12.0 );
   f.setSizeUnit( QgsUnitTypes::RenderPoints );
+  f.setLineHeight( 1.1 );
+  f.setLineHeightUnit( QgsUnitTypes::RenderPercentage );
   rstyle( QgsLegendStyle::Subgroup ).setTextFormat( f );
 
   f = rstyle( QgsLegendStyle::SymbolLabel ).textFormat();
   f.setSize( 12.0 );
   f.setSizeUnit( QgsUnitTypes::RenderPoints );
+  f.setLineHeight( 1.1 );
+  f.setLineHeightUnit( QgsUnitTypes::RenderPercentage );
   rstyle( QgsLegendStyle::SymbolLabel ).setTextFormat( f );
 }
 

diff --git a/...es/legend/expected_legend_long_symbol_text/expected_legend_long_symbol_text.png b/...es/legend/expected_legend_long_symbol_text/expected_legend_long_symbol_text.png
diff --git a/...gend/expected_legend_long_symbol_text/expected_legend_long_symbol_text_mask.png b/...gend/expected_legend_long_symbol_text/expected_legend_long_symbol_text_mask.png
diff --git a/...a/control_images/legend/expected_legend_multiline/expected_legend_multiline.png b/...a/control_images/legend/expected_legend_multiline/expected_legend_multiline.png
diff --git a/...trol_images/legend/expected_legend_multiline/expected_legend_multiline_mask.png b/...trol_images/legend/expected_legend_multiline/expected_legend_multiline_mask.png
diff --git a/...s/testdata/control_images/legend/expected_legend_multiline/legend_multiline.png b/...s/testdata/control_images/legend/expected_legend_multiline/legend_multiline.png
diff --git a/...ntrol_images/legend/expected_legend_tall_symbol/expected_legend_tall_symbol.png b/...ntrol_images/legend/expected_legend_tall_symbol/expected_legend_tall_symbol.png
diff --git a/..._images/legend/expected_legend_tall_symbol/expected_legend_tall_symbol_mask.png b/..._images/legend/expected_legend_tall_symbol/expected_legend_tall_symbol_mask.png