Fix multiline overlap - Fix for #4454

NathanW2 · NathanW2 · commit a739750e456c · 2011-10-30T11:11:28.000+10:00
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -434,10 +434,11 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString t
   {
     text.append( ">" );
   }
-  QRectF labelRect = fm->boundingRect( text );
+
   double w, h;
   if ( !multiLineLabels )
   {
+    QRectF labelRect = fm->boundingRect( text );
     w = labelRect.width() / rasterCompressFactor;
     h = labelRect.height() / rasterCompressFactor;
   }
@@ -452,9 +453,9 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString t
       if ( width > w )
       {
         w = width;
-      }
-      w /= rasterCompressFactor;
+      } 
     }
+    w /= rasterCompressFactor;
   }
   QgsPoint ptSize = xform->toMapCoordinatesF( w, h );
 

Original file line number	Diff line number	Diff line change
`@@ -434,10 +434,11 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString t`
`434`	`434`	`{`
`435`	`435`	`text.append( ">" );`
`436`	`436`	`}`
`437`		`- QRectF labelRect = fm->boundingRect( text );`
	`437`	`+`
`438`	`438`	`double w, h;`
`439`	`439`	`if ( !multiLineLabels )`
`440`	`440`	`{`
	`441`	`+ QRectF labelRect = fm->boundingRect( text );`
`441`	`442`	`w = labelRect.width() / rasterCompressFactor;`
`442`	`443`	`h = labelRect.height() / rasterCompressFactor;`
`443`	`444`	`}`
`@@ -452,9 +453,9 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString t`
`452`	`453`	`if ( width > w )`
`453`	`454`	`{`
`454`	`455`	`w = width;`
`455`		`- }`
`456`		`- w /= rasterCompressFactor;`
	`456`	`+ }`
`457`	`457`	`}`
	`458`	`+ w /= rasterCompressFactor;`
`458`	`459`	`}`
`459`	`460`	`QgsPoint ptSize = xform->toMapCoordinatesF( w, h );`
`460`	`461`