Actually properly hookup responsive cancelation for blurs

qgis · Sep 24, 2021 · f4987b2 · f4987b2
1 parent 81dcc34
commit f4987b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/core/effects/qgsblureffect.cpp b/src/core/effects/qgsblureffect.cpp
@@ -47,7 +47,7 @@ void QgsBlurEffect::drawStackBlur( QgsRenderContext &context )
 {
   const int blurLevel = std::round( context.convertToPainterUnits( mBlurLevel, mBlurUnit, mBlurMapUnitScale ) );
   QImage im = sourceAsImage( context )->copy();
-  QgsImageOperation::stackBlur( im, blurLevel, context.feedback() );
+  QgsImageOperation::stackBlur( im, blurLevel, false, context.feedback() );
   drawBlurredImage( context, im );
 }
 

diff --git a/src/core/effects/qgsgloweffect.cpp b/src/core/effects/qgsgloweffect.cpp
@@ -73,7 +73,7 @@ void QgsGlowEffect::draw( QgsRenderContext &context )
   const int blurLevel = std::round( context.convertToPainterUnits( mBlurLevel, mBlurUnit, mBlurMapUnitScale ) );
   if ( blurLevel <= 16 )
   {
-    QgsImageOperation::stackBlur( im, blurLevel, context.feedback() );
+    QgsImageOperation::stackBlur( im, blurLevel, false, context.feedback() );
   }
   else
   {

diff --git a/src/core/effects/qgsshadoweffect.cpp b/src/core/effects/qgsshadoweffect.cpp
@@ -31,8 +31,14 @@ void QgsShadowEffect::draw( QgsRenderContext &context )
   if ( !source() || !enabled() || !context.painter() )
     return;
 
+  if ( context.feedback() && context.feedback()->isCanceled() )
+    return;
+
   QImage colorisedIm = sourceAsImage( context )->copy();
 
+  if ( context.feedback() && context.feedback()->isCanceled() )
+    return;
+
   QPainter *painter = context.painter();
   const QgsScopedQPainterState painterState( painter );
   painter->setCompositionMode( mBlendMode );
@@ -49,7 +55,7 @@ void QgsShadowEffect::draw( QgsRenderContext &context )
   const int blurLevel = std::round( context.convertToPainterUnits( mBlurLevel, mBlurUnit, mBlurMapUnitScale ) );
   if ( blurLevel <= 16 )
   {
-    QgsImageOperation::stackBlur( colorisedIm, blurLevel, context.feedback() );
+    QgsImageOperation::stackBlur( colorisedIm, blurLevel, false, context.feedback() );
   }
   else
   {