qgis · Feb 26, 2016
diff --git a/‎src/core/qgspallabeling.cpp
Lines changed: 1 addition & 1 deletion b/‎src/core/qgspallabeling.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/testdata/control_images/expected_pal_placement/sp_point_dd_ordered_placement1/sp_point_dd_ordered_placement1_mask.png
-6 Bytes b/‎tests/testdata/control_images/expected_pal_placement/sp_point_dd_ordered_placement1/sp_point_dd_ordered_placement1_mask.png
-6 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_placement/sp_point_ordered_placement3/sp_point_ordered_placement3_mask.png
10 Bytes b/‎tests/testdata/control_images/expected_pal_placement/sp_point_ordered_placement3/sp_point_ordered_placement3_mask.png
10 Bytes
diff --git a/‎tests/testdata/labeling/pal_features_v3.sqlite
0 Bytes b/‎tests/testdata/labeling/pal_features_v3.sqlite
0 Bytes
@@ -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;