Tweak vertical position of labels under points in "cartographic"

label placement mode Previously labels were being drawn too low
qgis · Feb 26, 2016 · 58c85bb · 58c85bb
1 parent 75d6a19
commit 58c85bb
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 1 deletion.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -2695,7 +2695,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &cont
 
   //set label's visual margin so that top visual margin is the leading, and bottom margin is the font's descent
   //this makes labels align to the font's baseline or highest character
-  double topMargin = qMax( labelFontMetrics->leading(), 0.0 ) + 1.0;
+  double topMargin = qMax( 0.25 * labelFontMetrics->ascent(), 0.0 );
   double bottomMargin = 1.0 + labelFontMetrics->descent();
   QgsLabelFeature::VisualMargin vm( topMargin, 0.0, bottomMargin, 0.0 );
   vm *= xform->mapUnitsPerPixel() / rasterCompressFactor;

diff --git a/...lacement/sp_point_dd_ordered_placement1/sp_point_dd_ordered_placement1_mask.png b/...lacement/sp_point_dd_ordered_placement1/sp_point_dd_ordered_placement1_mask.png
diff --git a/..._pal_placement/sp_point_ordered_placement3/sp_point_ordered_placement3_mask.png b/..._pal_placement/sp_point_ordered_placement3/sp_point_ordered_placement3_mask.png
diff --git a/tests/testdata/labeling/pal_features_v3.sqlite b/tests/testdata/labeling/pal_features_v3.sqlite