Fix placement of perimeter labels with HTML formatting enabled

nyalldawson · nyalldawson · commit f297e6c9cda2 · 2023-03-06T08:36:08.000+10:00
Fixes #51829 (cherry picked from commit 2259924)
diff --git a/src/core/labeling/qgsvectorlayerlabelprovider.cpp b/src/core/labeling/qgsvectorlayerlabelprovider.cpp
@@ -660,7 +660,7 @@ void QgsVectorLayerLabelProvider::drawLabelPrivate( pal::LabelPosition *label, Q
 
     QgsTextDocument document;
     QgsTextDocumentMetrics metrics;
-    if ( !tmpLyr.format().allowHtmlFormatting() || tmpLyr.placement == Qgis::LabelPlacement::Curved )
+    if ( !tmpLyr.format().allowHtmlFormatting() || tmpLyr.placement == Qgis::LabelPlacement::Curved || tmpLyr.placement == Qgis::LabelPlacement::PerimeterCurved )
     {
       const QgsTextCharacterFormat c = lf->characterFormat( label->getPartId() );
       const QStringList multiLineList = QgsPalLabeling::splitToLines( txt, tmpLyr.wrapChar, tmpLyr.autoWrapLength, tmpLyr.useMaxLineLengthForAutoWrap );

Original file line number	Diff line number	Diff line change
`@@ -660,7 +660,7 @@ void QgsVectorLayerLabelProvider::drawLabelPrivate( pal::LabelPosition *label, Q`
`660`	`660`
`661`	`661`	`QgsTextDocument document;`
`662`	`662`	`QgsTextDocumentMetrics metrics;`
`663`		`- if ( !tmpLyr.format().allowHtmlFormatting() \|\| tmpLyr.placement == Qgis::LabelPlacement::Curved )`
	`663`	`+ if ( !tmpLyr.format().allowHtmlFormatting() \|\| tmpLyr.placement == Qgis::LabelPlacement::Curved \|\| tmpLyr.placement == Qgis::LabelPlacement::PerimeterCurved )`
`664`	`664`	`{`
`665`	`665`	`const QgsTextCharacterFormat c = lf->characterFormat( label->getPartId() );`
`666`	`666`	`const QStringList multiLineList = QgsPalLabeling::splitToLines( txt, tmpLyr.wrapChar, tmpLyr.autoWrapLength, tmpLyr.useMaxLineLengthForAutoWrap );`