Avoid some bleed of masked features outside of layout map extent

Partial fix for qgis#53542
nyalldawson · Jun 27, 2024 · 76a12b9 · 76a12b9
1 parent 5ac2172
commit 76a12b9
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/core/symbology/qgssymbollayer.cpp b/src/core/symbology/qgssymbollayer.cpp
@@ -976,12 +976,18 @@ QPainterPath generateClipPath( const QgsRenderContext &renderContext, const QStr
 #endif
     if ( !mergedGeom.isEmpty() )
     {
-      const QgsGeometry exterior = rect
-                                   ? QgsGeometry::fromRect( *rect )
-                                   : QgsGeometry::fromRect(
-                                     QgsRectangle( 0, 0,
-                                         renderContext.outputSize().width(),
-                                         renderContext.outputSize().height() ) );
+      QgsGeometry exterior;
+      const QgsRectangle contextBounds( 0, 0,
+                                        renderContext.outputSize().width(),
+                                        renderContext.outputSize().height() );
+      if ( rect )
+      {
+        exterior = QgsGeometry::fromRect( QgsRectangle( *rect ).intersect( contextBounds ) );
+      }
+      else
+      {
+        exterior = QgsGeometry::fromRect( contextBounds );
+      }
       const QgsGeometry maskGeom = exterior.difference( mergedGeom );
       if ( !maskGeom.isNull() )
       {