Fix test

The test was using a non-real-world situation where we were setting the flag to render label rects only, but then trying to also retrieve the label results.
qgis · Dec 3, 2024 · 2f35db3 · 2f35db3
1 parent 585a3d8
commit 2f35db3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/core/labeling/qgslabelingengine.cpp b/src/core/labeling/qgslabelingengine.cpp
@@ -560,6 +560,14 @@ void QgsLabelingEngine::drawLabels( QgsRenderContext &context, const QString &la
     {
       drawLabelRect( label );
     }
+
+    if ( settings.testFlag( Qgis::LabelingFlag::DrawUnplacedLabels ) )
+    {
+      for ( pal::LabelPosition *label : std::as_const( mUnlabeled ) )
+      {
+        drawLabelRect( label );
+      }
+    }
   }
   else
   {

diff --git a/tests/src/core/testqgslabelingengine.cpp b/tests/src/core/testqgslabelingengine.cpp
@@ -4209,7 +4209,6 @@ void TestQgsLabelingEngine::labelingResults()
 
   QgsLabelingEngineSettings engineSettings = mapSettings.labelingEngineSettings();
   engineSettings.setFlag( Qgis::LabelingFlag::UsePartialCandidates, false );
-  engineSettings.setFlag( Qgis::LabelingFlag::DrawLabelRectOnly, true );
   //engineSettings.setFlag( Qgis::LabelingFlag::DrawCandidates, true );
   mapSettings.setLabelingEngineSettings( engineSettings );
 
@@ -4415,7 +4414,6 @@ void TestQgsLabelingEngine::labelingResultsCurved()
 
   QgsLabelingEngineSettings engineSettings = mapSettings.labelingEngineSettings();
   engineSettings.setFlag( Qgis::LabelingFlag::UsePartialCandidates, false );
-  engineSettings.setFlag( Qgis::LabelingFlag::DrawLabelRectOnly, true );
   //engineSettings.setFlag( Qgis::LabelingFlag::DrawCandidates, true );
   mapSettings.setLabelingEngineSettings( engineSettings );