From 5e4b542d1e94619021faec52898f9e4e51343457 Mon Sep 17 00:00:00 2001
From: JuhoErvasti <juho.ervasti@gispo.fi>
Date: Wed, 4 Dec 2024 09:28:54 +0200
Subject: [PATCH 01/15] Add extent buffer property to QgsSymbol

---
 python/PyQt6/core/auto_additions/qgssymbol.py |  7 ++++++
 .../auto_generated/symbology/qgssymbol.sip.in | 22 +++++++++++++++++++
 python/core/auto_additions/qgssymbol.py       |  7 ++++++
 .../auto_generated/symbology/qgssymbol.sip.in | 22 +++++++++++++++++++
 src/core/symbology/qgssymbol.cpp              | 15 +++++++++++++
 src/core/symbology/qgssymbol.h                | 20 +++++++++++++++++
 src/core/symbology/qgssymbollayerutils.cpp    |  2 ++
 tests/src/python/test_qgssymbol.py            |  7 ++++++
 8 files changed, 102 insertions(+)

diff --git a/python/PyQt6/core/auto_additions/qgssymbol.py b/python/PyQt6/core/auto_additions/qgssymbol.py
index 2f30f8a66584..80a96bdf33ca 100644
--- a/python/PyQt6/core/auto_additions/qgssymbol.py
+++ b/python/PyQt6/core/auto_additions/qgssymbol.py
@@ -4,6 +4,9 @@
 QgsSymbol.Property.PropertyOpacity = QgsSymbol.Property.Opacity
 QgsSymbol.PropertyOpacity.is_monkey_patched = True
 QgsSymbol.PropertyOpacity.__doc__ = "Opacity"
+QgsSymbol.ExtentBuffer = QgsSymbol.Property.ExtentBuffer
+QgsSymbol.ExtentBuffer.is_monkey_patched = True
+QgsSymbol.ExtentBuffer.__doc__ = "Extent buffer \n.. versionadded:: 3.42"
 QgsSymbol.Property.__doc__ = """Data definable properties.
 
 .. versionadded:: 3.18
@@ -12,6 +15,10 @@
 
   Available as ``QgsSymbol.PropertyOpacity`` in older QGIS releases.
 
+* ``ExtentBuffer``: Extent buffer
+
+  .. versionadded:: 3.42
+
 
 """
 # --
diff --git a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
index c04f05b5114a..8f3a64d9858b 100644
--- a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
@@ -244,6 +244,7 @@ Returns the default symbol type required for the specified geometry ``type``.
     enum class Property /BaseType=IntEnum/
     {
       Opacity,
+      ExtentBuffer,
     };
 
     static const QgsPropertiesDefinition &propertyDefinitions();
@@ -863,6 +864,26 @@ Internally, this notifies all symbol layers which were used via a call to
 :py:func:`QgsSymbolLayer.stopFeatureRender()`.
 
 .. versionadded:: 3.20
+%End
+
+    double extentBuffer() const;
+%Docstring
+Returns the symbol's extent buffer.
+
+.. versionadded:: 3.42
+
+:return: The symbol's extent buffer
+%End
+
+    void setExtentBuffer( double extentBuffer );
+%Docstring
+Sets the symbol's extent buffer.
+
+.. versionadded:: 3.42
+
+:param extentBuffer: buffer distance in map units
+
+.. seealso:: :py:func:`extentBuffer`
 %End
 
   protected:
@@ -934,6 +955,7 @@ Render editing vertex marker at specified point
 
 
 
+
   private:
     QgsSymbol( const QgsSymbol & );
 };
diff --git a/python/core/auto_additions/qgssymbol.py b/python/core/auto_additions/qgssymbol.py
index 2f30f8a66584..80a96bdf33ca 100644
--- a/python/core/auto_additions/qgssymbol.py
+++ b/python/core/auto_additions/qgssymbol.py
@@ -4,6 +4,9 @@
 QgsSymbol.Property.PropertyOpacity = QgsSymbol.Property.Opacity
 QgsSymbol.PropertyOpacity.is_monkey_patched = True
 QgsSymbol.PropertyOpacity.__doc__ = "Opacity"
+QgsSymbol.ExtentBuffer = QgsSymbol.Property.ExtentBuffer
+QgsSymbol.ExtentBuffer.is_monkey_patched = True
+QgsSymbol.ExtentBuffer.__doc__ = "Extent buffer \n.. versionadded:: 3.42"
 QgsSymbol.Property.__doc__ = """Data definable properties.
 
 .. versionadded:: 3.18
@@ -12,6 +15,10 @@
 
   Available as ``QgsSymbol.PropertyOpacity`` in older QGIS releases.
 
+* ``ExtentBuffer``: Extent buffer
+
+  .. versionadded:: 3.42
+
 
 """
 # --
diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in
index ad492e708570..488e3d512e86 100644
--- a/python/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/core/auto_generated/symbology/qgssymbol.sip.in
@@ -244,6 +244,7 @@ Returns the default symbol type required for the specified geometry ``type``.
     enum class Property
     {
       Opacity,
+      ExtentBuffer,
     };
 
     static const QgsPropertiesDefinition &propertyDefinitions();
@@ -863,6 +864,26 @@ Internally, this notifies all symbol layers which were used via a call to
 :py:func:`QgsSymbolLayer.stopFeatureRender()`.
 
 .. versionadded:: 3.20
+%End
+
+    double extentBuffer() const;
+%Docstring
+Returns the symbol's extent buffer.
+
+.. versionadded:: 3.42
+
+:return: The symbol's extent buffer
+%End
+
+    void setExtentBuffer( double extentBuffer );
+%Docstring
+Sets the symbol's extent buffer.
+
+.. versionadded:: 3.42
+
+:param extentBuffer: buffer distance in map units
+
+.. seealso:: :py:func:`extentBuffer`
 %End
 
   protected:
@@ -934,6 +955,7 @@ Render editing vertex marker at specified point
 
 
 
+
   private:
     QgsSymbol( const QgsSymbol & );
 };
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
index 583625f8e34a..01b0635cd929 100644
--- a/src/core/symbology/qgssymbol.cpp
+++ b/src/core/symbology/qgssymbol.cpp
@@ -20,12 +20,14 @@
 #include <QSvgGenerator>
 #include <QPicture>
 
+#include <algorithm>
 #include <cmath>
 #include <map>
 #include <random>
 
 #include "qgssymbol.h"
 #include "qgspolyhedralsurface.h"
+#include "qgsrectangle.h"
 #include "qgssymbollayer.h"
 
 #include "qgsgeometrygeneratorsymbollayer.h"
@@ -2223,6 +2225,17 @@ QgsSymbolRenderContext *QgsSymbol::symbolRenderContext()
   return mSymbolRenderContext.get();
 }
 
+double QgsSymbol::extentBuffer() const
+{
+  return mExtentBuffer;
+}
+
+void QgsSymbol::setExtentBuffer( double extentBuffer )
+{
+  mExtentBuffer = extentBuffer;
+}
+
+
 void QgsSymbol::renderVertexMarker( QPointF pt, QgsRenderContext &context, Qgis::VertexMarkerType currentVertexMarkerType, double currentVertexMarkerSize )
 {
   int markerSize = context.convertToPainterUnits( currentVertexMarkerSize, Qgis::RenderUnit::Millimeters );
@@ -2239,6 +2252,7 @@ void QgsSymbol::initPropertyDefinitions()
   sPropertyDefinitions = QgsPropertiesDefinition
   {
     { static_cast< int >( QgsSymbol::Property::Opacity ), QgsPropertyDefinition( "alpha", QObject::tr( "Opacity" ), QgsPropertyDefinition::Opacity, origin )},
+    { static_cast< int >( QgsSymbol::Property::ExtentBuffer ), QgsPropertyDefinition( "extent_buffer", QObject::tr( "Extent buffer" ), QgsPropertyDefinition::Double, origin )},
   };
 }
 
@@ -2298,6 +2312,7 @@ void QgsSymbol::copyCommonProperties( const QgsSymbol *other )
   mDataDefinedProperties = other->mDataDefinedProperties;
   mSymbolFlags = other->mSymbolFlags;
   mAnimationSettings = other->mAnimationSettings;
+  mExtentBuffer = other->mExtentBuffer;
   if ( other->mBufferSettings )
     mBufferSettings = std::make_unique< QgsSymbolBufferSettings >( *other->mBufferSettings );
   else
diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
index 8007a43876c9..3c8c1cb88e19 100644
--- a/src/core/symbology/qgssymbol.h
+++ b/src/core/symbology/qgssymbol.h
@@ -269,6 +269,7 @@ class CORE_EXPORT QgsSymbol
     enum class Property SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsSymbol, Property ) : int
     {
       Opacity SIP_MONKEYPATCH_COMPAT_NAME( PropertyOpacity ), //!< Opacity
+      ExtentBuffer, //!< Extent buffer \since QGIS 3.42
     };
     // *INDENT-ON*
 
@@ -867,6 +868,23 @@ class CORE_EXPORT QgsSymbol
      */
     void stopFeatureRender( const QgsFeature &feature, QgsRenderContext &context, int layer = -1 );
 
+    /**
+     * Returns the symbol's extent buffer.
+     *
+     * \since QGIS 3.42
+     * \returns The symbol's extent buffer
+     */
+    double extentBuffer() const;
+
+    /**
+     * Sets the symbol's extent buffer.
+     *
+     * \since QGIS 3.42
+     * \param extentBuffer buffer distance in map units
+     * \see extentBuffer()
+     */
+    void setExtentBuffer( double extentBuffer );
+
   protected:
 
     /**
@@ -955,6 +973,8 @@ class CORE_EXPORT QgsSymbol
     Qgis::SymbolType mType;
     QgsSymbolLayerList mLayers;
 
+    double mExtentBuffer = 0;
+
     //! Symbol opacity (in the range 0 - 1)
     qreal mOpacity = 1.0;
 
diff --git a/src/core/symbology/qgssymbollayerutils.cpp b/src/core/symbology/qgssymbollayerutils.cpp
index 99784f691626..df7bcc65e933 100644
--- a/src/core/symbology/qgssymbollayerutils.cpp
+++ b/src/core/symbology/qgssymbollayerutils.cpp
@@ -1334,6 +1334,7 @@ QgsSymbol *QgsSymbolLayerUtils::loadSymbol( const QDomElement &element, const Qg
     symbol->setMapUnitScale( mapUnitScale );
   }
   symbol->setOpacity( element.attribute( QStringLiteral( "alpha" ), QStringLiteral( "1.0" ) ).toDouble() );
+  symbol->setExtentBuffer( element.attribute( QStringLiteral( "extent_buffer" ), QStringLiteral( "0.0" ) ).toDouble() );
   symbol->setClipFeaturesToExtent( element.attribute( QStringLiteral( "clip_to_extent" ), QStringLiteral( "1" ) ).toInt() );
   symbol->setForceRHR( element.attribute( QStringLiteral( "force_rhr" ), QStringLiteral( "0" ) ).toInt() );
   Qgis::SymbolFlags flags;
@@ -1452,6 +1453,7 @@ QDomElement QgsSymbolLayerUtils::saveSymbol( const QString &name, const QgsSymbo
   symEl.setAttribute( QStringLiteral( "name" ), name );
   symEl.setAttribute( QStringLiteral( "alpha" ), QString::number( symbol->opacity() ) );
   symEl.setAttribute( QStringLiteral( "clip_to_extent" ), symbol->clipFeaturesToExtent() ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
+  symEl.setAttribute( QStringLiteral( "extent_buffer" ), QString::number( symbol->extentBuffer() ) );
   symEl.setAttribute( QStringLiteral( "force_rhr" ), symbol->forceRHR() ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
   if ( symbol->flags() & Qgis::SymbolFlag::RendererShouldUseSymbolLevels )
     symEl.setAttribute( QStringLiteral( "renderer_should_use_levels" ), QStringLiteral( "1" ) );
diff --git a/tests/src/python/test_qgssymbol.py b/tests/src/python/test_qgssymbol.py
index 39265c797e48..bc9c814aa3d2 100644
--- a/tests/src/python/test_qgssymbol.py
+++ b/tests/src/python/test_qgssymbol.py
@@ -921,6 +921,13 @@ def test_animation_settings(self):
         self.assertTrue(s3.animationSettings().isAnimated())
         self.assertEqual(s3.animationSettings().frameRate(), 30)
 
+    def test_extent_buffer(self):
+        s = QgsFillSymbol()
+        self.assertEqual(s.extentBuffer(), 0)
+
+        s.setExtentBuffer(10)
+        self.assertEqual(s.extentBuffer(), 10)
+
     def renderCollection(self, geom, symbol):
         f = QgsFeature()
         f.setGeometry(geom)

From d19bd8d87788db26170a8f76b07349d0dde503c2 Mon Sep 17 00:00:00 2001
From: JuhoErvasti <juho.ervasti@gispo.fi>
Date: Wed, 4 Dec 2024 09:30:43 +0200
Subject: [PATCH 02/15] Add maximumExtentBuffer() function to
 QgsFeatureRenderer

---
 .../symbology/qgsrenderer.sip.in              | 12 +++++++
 .../symbology/qgsrenderer.sip.in              | 12 +++++++
 src/core/symbology/qgsrenderer.cpp            | 33 +++++++++++++++++++
 src/core/symbology/qgsrenderer.h              |  9 +++++
 4 files changed, 66 insertions(+)

diff --git a/python/PyQt6/core/auto_generated/symbology/qgsrenderer.sip.in b/python/PyQt6/core/auto_generated/symbology/qgsrenderer.sip.in
index 3ef1a60e7918..d1820bf91d54 100644
--- a/python/PyQt6/core/auto_generated/symbology/qgsrenderer.sip.in
+++ b/python/PyQt6/core/auto_generated/symbology/qgsrenderer.sip.in
@@ -628,6 +628,18 @@ Currently clones
 :param destRenderer: destination renderer for copied effect
 
 .. versionadded:: 3.22
+%End
+
+    double maximumExtentBuffer( QgsRenderContext &context ) const;
+%Docstring
+Returns the maximum extent buffer found in this renderer's
+symbols' symbol layers.
+
+.. note::
+
+   Returns 0 if the renderer doesn't have any symbols.
+
+.. versionadded:: 3.42
 %End
 
   protected:
diff --git a/python/core/auto_generated/symbology/qgsrenderer.sip.in b/python/core/auto_generated/symbology/qgsrenderer.sip.in
index c17fb32bd6d4..a704df505a77 100644
--- a/python/core/auto_generated/symbology/qgsrenderer.sip.in
+++ b/python/core/auto_generated/symbology/qgsrenderer.sip.in
@@ -628,6 +628,18 @@ Currently clones
 :param destRenderer: destination renderer for copied effect
 
 .. versionadded:: 3.22
+%End
+
+    double maximumExtentBuffer( QgsRenderContext &context ) const;
+%Docstring
+Returns the maximum extent buffer found in this renderer's
+symbols' symbol layers.
+
+.. note::
+
+   Returns 0 if the renderer doesn't have any symbols.
+
+.. versionadded:: 3.42
 %End
 
   protected:
diff --git a/src/core/symbology/qgsrenderer.cpp b/src/core/symbology/qgsrenderer.cpp
index c6fb1aed2724..ac3b980e8859 100644
--- a/src/core/symbology/qgsrenderer.cpp
+++ b/src/core/symbology/qgsrenderer.cpp
@@ -38,6 +38,7 @@
 #include <QDomDocument>
 #include <QPolygonF>
 #include <QThread>
+#include <algorithm>
 
 QgsPropertiesDefinition QgsFeatureRenderer::sPropertyDefinitions;
 
@@ -417,6 +418,38 @@ QgsLegendSymbolList QgsFeatureRenderer::legendSymbolItems() const
   return QgsLegendSymbolList();
 }
 
+double QgsFeatureRenderer::maximumExtentBuffer( QgsRenderContext &context ) const
+{
+  const QgsSymbolList symbolList = symbols( context );
+
+  if ( symbolList.empty() )
+    return 0;
+
+  const QgsExpressionContext &expContext = context.expressionContext();
+
+  auto getValueFromSymbol = [ &expContext ]( const QgsSymbol * sym ) -> double
+  {
+    const QgsProperty property = sym->dataDefinedProperties().property( QgsSymbol::Property::ExtentBuffer );
+
+    if ( property.isActive() && ! property.expressionString().isEmpty() )
+    {
+      return sym->dataDefinedProperties().valueAsDouble( QgsSymbol::Property::ExtentBuffer, expContext );
+    }
+
+    return sym->extentBuffer();
+  };
+
+  if ( symbolList.size() == 1 )
+    return getValueFromSymbol( symbolList[0] );
+
+  auto it = std::max_element( symbolList.constBegin(), symbolList.constEnd(), [ &getValueFromSymbol ]( const QgsSymbol * a, const QgsSymbol * b ) -> bool
+  {
+    return getValueFromSymbol( a ) < getValueFromSymbol( b );
+  } );
+
+  return getValueFromSymbol( *it );
+}
+
 QList<QgsLayerTreeModelLegendNode *> QgsFeatureRenderer::createLegendNodes( QgsLayerTreeLayer *nodeLayer ) const
 {
   QList<QgsLayerTreeModelLegendNode *> nodes;
diff --git a/src/core/symbology/qgsrenderer.h b/src/core/symbology/qgsrenderer.h
index 7adc935214bd..431a8635ca9c 100644
--- a/src/core/symbology/qgsrenderer.h
+++ b/src/core/symbology/qgsrenderer.h
@@ -653,6 +653,15 @@ class CORE_EXPORT QgsFeatureRenderer
      */
     void copyRendererData( QgsFeatureRenderer *destRenderer ) const;
 
+    /**
+     * Returns the maximum extent buffer found in this renderer's
+     * symbols' symbol layers.
+     *
+     * \note Returns 0 if the renderer doesn't have any symbols.
+     * \since QGIS 3.42
+     */
+    double maximumExtentBuffer( QgsRenderContext &context ) const;
+
   protected:
     QgsFeatureRenderer( const QString &type );
 

From 8496dcdddf19ba21d193369435e30c167ab50acd Mon Sep 17 00:00:00 2001
From: JuhoErvasti <juho.ervasti@gispo.fi>
Date: Wed, 4 Dec 2024 09:31:33 +0200
Subject: [PATCH 03/15] Add tests for maximumExtentBuffer()

---
 .../test_qgscategorizedsymbolrenderer.py      | 36 +++++++++++++++++++
 .../python/test_qgssinglesymbolrenderer.py    | 18 ++++++++++
 2 files changed, 54 insertions(+)

diff --git a/tests/src/python/test_qgscategorizedsymbolrenderer.py b/tests/src/python/test_qgscategorizedsymbolrenderer.py
index fb230c3c92cf..21633dca57c5 100644
--- a/tests/src/python/test_qgscategorizedsymbolrenderer.py
+++ b/tests/src/python/test_qgscategorizedsymbolrenderer.py
@@ -1405,6 +1405,42 @@ def test_to_sld(self):
 """,
         )
 
+    def testMaximumExtentBuffer(self):
+        # setup renderer
+
+        fields = QgsFields()
+        fields.append(QgsField("x"))
+
+        renderer = QgsCategorizedSymbolRenderer()
+        renderer.setClassAttribute("x")
+
+        symbol_a = createMarkerSymbol()
+        symbol_a.setColor(QColor(255, 0, 0))
+        symbol_a.setExtentBuffer(10)
+        renderer.addCategory(QgsRendererCategory("a", symbol_a, "a"))
+
+        symbol_b = createMarkerSymbol()
+        symbol_b.setColor(QColor(0, 255, 0))
+        symbol_b.setExtentBuffer(-10)
+        renderer.addCategory(QgsRendererCategory("b", symbol_b, "b"))
+
+        symbol_c = createMarkerSymbol()
+        symbol_c.setColor(QColor(0, 0, 255))
+        symbol_c.setExtentBuffer(20)
+        renderer.addCategory(QgsRendererCategory("c", symbol_c, "c", False))
+
+        symbol_d = createMarkerSymbol()
+        symbol_d.setColor(QColor(255, 0, 255))
+        symbol_d.setExtentBuffer(15)
+        renderer.addCategory(QgsRendererCategory(["d", "e"], symbol_d, "de"))
+
+        # add default category
+
+        default_symbol = createMarkerSymbol()
+        default_symbol.setColor(QColor(255, 255, 255))
+        renderer.addCategory(QgsRendererCategory("", default_symbol, "default"))
+
+        self.assertEqual(renderer.maximumExtentBuffer(QgsRenderContext()), 20)
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/src/python/test_qgssinglesymbolrenderer.py b/tests/src/python/test_qgssinglesymbolrenderer.py
index 9eab10ecdc51..768fdbc3427a 100644
--- a/tests/src/python/test_qgssinglesymbolrenderer.py
+++ b/tests/src/python/test_qgssinglesymbolrenderer.py
@@ -114,6 +114,24 @@ def test_legend_key_to_expression(self):
         exp, ok = renderer.legendKeyToExpression("xxxx", None)
         self.assertFalse(ok)
 
+    def test_maximum_extent_buffer(self):
+        sym1 = QgsFillSymbol.createSimple(
+            {"color": "#fdbf6f", "outline_color": "black"}
+        )
+
+        renderer1 = QgsSingleSymbolRenderer(sym1)
+
+        self.assertEqual(renderer1.maximumExtentBuffer(QgsRenderContext()), 0)
+
+        sym2 = QgsFillSymbol.createSimple(
+            {"color": "#fdbf6f", "outline_color": "black"}
+        )
+        sym2.setExtentBuffer(100)
+
+        renderer2 = QgsSingleSymbolRenderer(sym2)
+
+        self.assertEqual(renderer2.maximumExtentBuffer(QgsRenderContext()), 100)
+
 
 if __name__ == "__main__":
     unittest.main()

From ab49e82ab647ba5beb6c1ac50f617170d3119d4f Mon Sep 17 00:00:00 2001
From: JuhoErvasti <juho.ervasti@gispo.fi>
Date: Wed, 4 Dec 2024 09:32:49 +0200
Subject: [PATCH 04/15] Modify feature request extent based on max extent
 buffer

---
 src/core/vector/qgsvectorlayerrenderer.cpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/core/vector/qgsvectorlayerrenderer.cpp b/src/core/vector/qgsvectorlayerrenderer.cpp
index 4cf56ac980ef..69048c0f0c26 100644
--- a/src/core/vector/qgsvectorlayerrenderer.cpp
+++ b/src/core/vector/qgsvectorlayerrenderer.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsmessagelog.h"
 #include "qgspallabeling.h"
+#include "qgsrectangle.h"
 #include "qgsrenderer.h"
 #include "qgsrendercontext.h"
 #include "qgssinglesymbolrenderer.h"
@@ -354,8 +355,26 @@ bool QgsVectorLayerRenderer::renderInternal( QgsFeatureRenderer *renderer, int r
     if ( mDiagramProvider )
       mDiagramProvider->setClipFeatureGeometry( mLabelClipFeatureGeom );
   }
+
+
   renderer->modifyRequestExtent( requestExtent, context );
 
+  double maximumExtentBuffer = renderer->maximumExtentBuffer( context );
+
+  if ( maximumExtentBuffer != 0 )
+  {
+    bool bufferDisappearsExtent = maximumExtentBuffer < 0 && ( requestExtent.width() + ( maximumExtentBuffer * 2 ) < 0 || requestExtent.height() + ( maximumExtentBuffer * 2 ) < 0 );
+
+    // nothing to draw
+    if ( bufferDisappearsExtent )
+    {
+      renderer->stopRender( context );
+      return true;
+    }
+
+    requestExtent = requestExtent.buffered( maximumExtentBuffer );
+  }
+
   QgsFeatureRequest featureRequest = QgsFeatureRequest()
                                      .setFilterRect( requestExtent )
                                      .setSubsetOfAttributes( mAttrNames, mFields )

From 984a9475f0ce9a8a76e8f459f883f9b5dfb78e9d Mon Sep 17 00:00:00 2001
From: JuhoErvasti <juho.ervasti@gispo.fi>
Date: Wed, 4 Dec 2024 09:33:51 +0200
Subject: [PATCH 05/15] Add tests for rendering with extent buffer

---
 .../src/python/test_qgsvectorlayerrenderer.py | 100 ++++++++++++++++++
 .../expected_buffer_extent.png                | Bin 0 -> 4825 bytes
 .../expected_buffer_extent_zero.png           | Bin 0 -> 3618 bytes
 .../expected_negative_buffer_extent.png       | Bin 0 -> 9219 bytes
 4 files changed, 100 insertions(+)
 create mode 100644 tests/testdata/control_images/vectorlayerrenderer/expected_buffer_extent/expected_buffer_extent.png
 create mode 100644 tests/testdata/control_images/vectorlayerrenderer/expected_buffer_extent_zero/expected_buffer_extent_zero.png
 create mode 100644 tests/testdata/control_images/vectorlayerrenderer/expected_negative_buffer_extent/expected_negative_buffer_extent.png

diff --git a/tests/src/python/test_qgsvectorlayerrenderer.py b/tests/src/python/test_qgsvectorlayerrenderer.py
index 67644fc8a3b9..eace39b992ad 100644
--- a/tests/src/python/test_qgsvectorlayerrenderer.py
+++ b/tests/src/python/test_qgsvectorlayerrenderer.py
@@ -16,21 +16,27 @@
 from qgis.PyQt.QtGui import QColor
 
 from qgis.core import (
+    edit,
     Qgis,
     QgsCategorizedSymbolRenderer,
     QgsCentroidFillSymbolLayer,
     QgsCoordinateReferenceSystem,
+    QgsFeature,
     QgsFeatureRendererGenerator,
     QgsFillSymbol,
     QgsGeometry,
+    QgsGeometryGeneratorSymbolLayer,
     QgsLineSymbol,
     QgsMapClippingRegion,
     QgsMapSettings,
     QgsMarkerSymbol,
+    QgsPointXY,
     QgsRectangle,
     QgsRendererCategory,
     QgsRuleBasedRenderer,
     QgsSingleSymbolRenderer,
+    QgsSymbol,
+    QgsRenderContext,
     QgsVectorLayer,
 )
 import unittest
@@ -927,6 +933,100 @@ def testRenderWithSelectedFeatureSymbol(self):
             )
         )
 
+    def testRenderWithExtentBuffer(self):
+        def createFeature(x: float, y: float) -> QgsFeature:
+            feat = QgsFeature()
+            feat.setGeometry(QgsGeometry.fromPointXY(QgsPointXY(x, y)))
+
+            return feat
+
+        def createSymbol() -> QgsMarkerSymbol:
+            sym = QgsMarkerSymbol.createSimple({'color': '#33aa33', 'outline_style': 'no', 'size': '5'})
+            return sym
+
+        def createGeometryGenerator() -> QgsGeometryGeneratorSymbolLayer:
+            geomgen = QgsGeometryGeneratorSymbolLayer.create(
+                {'geometryModifier': 'make_point($x + if($x <= 0, 5, -5), $y)'}
+            )
+            geomgen.setSymbolType(QgsSymbol.SymbolType.Marker)
+            geomgen.setSubSymbol(QgsMarkerSymbol.createSimple({'color': '#ff00ff', 'outline_style': 'no', 'size': '6'}))
+
+            return geomgen
+
+        point_layer = QgsVectorLayer("Point?crs=EPSG:3857", "point layer", "memory")
+
+        with edit(point_layer):
+            point_layer.addFeature(createFeature(-15.999, 8))
+            point_layer.addFeature(createFeature(-16.001, 6))
+            point_layer.addFeature(createFeature(-13, 4))
+            point_layer.addFeature(createFeature(-10, 2))
+            point_layer.addFeature(createFeature(17, 0))
+            point_layer.addFeature(createFeature(4, -2))
+            point_layer.addFeature(createFeature(15.999, -4))
+            point_layer.addFeature(createFeature(17, -6))
+            point_layer.addFeature(createFeature(15.999, -8))
+
+        sym1 = createSymbol()
+        sym1.appendSymbolLayer(createGeometryGenerator())
+
+        renderer1 = QgsSingleSymbolRenderer(sym1)
+        point_layer.setRenderer(renderer1)
+
+        mapsettings = QgsMapSettings()
+        mapsettings.setOutputSize(QSize(400, 400))
+        mapsettings.setOutputDpi(96)
+        mapsettings.setDestinationCrs(QgsCoordinateReferenceSystem('EPSG:3857'))
+        mapsettings.setExtent(QgsRectangle(-10, -10, 10, 10))
+        mapsettings.setLayers([point_layer])
+
+        self.assertTrue(
+            self.render_map_settings_check(
+                'buffer_extent_zero',
+                'buffer_extent_zero',
+                mapsettings,
+            )
+        )
+
+        sym2 = createSymbol()
+        sym2.appendSymbolLayer(createGeometryGenerator())
+        sym2.setExtentBuffer(1)
+
+        renderer2 = QgsSingleSymbolRenderer(sym2)
+        point_layer.setRenderer(renderer2)
+
+        self.assertTrue(
+            self.render_map_settings_check(
+                'buffer_extent',
+                'buffer_extent',
+                mapsettings,
+            )
+        )
+
+    def testRenderWithExtentBufferNegative(self):
+        poly_layer = QgsVectorLayer(os.path.join(TEST_DATA_DIR, 'polys.shp'))
+        self.assertTrue(poly_layer.isValid())
+
+        sym1 = QgsFillSymbol.createSimple({'color': '#ff00ff', 'outline_color': '#000000', 'outline_width': '1'})
+        sym1.setExtentBuffer(-13.5)
+
+        renderer = QgsSingleSymbolRenderer(sym1)
+        poly_layer.setRenderer(renderer)
+
+        mapsettings = QgsMapSettings()
+        mapsettings.setOutputSize(QSize(400, 400))
+        mapsettings.setOutputDpi(96)
+        mapsettings.setDestinationCrs(QgsCoordinateReferenceSystem('EPSG:3857'))
+        mapsettings.setExtent(QgsRectangle(-13875783.2, 2266009.4, -8690110.7, 6673344.5))
+        mapsettings.setLayers([poly_layer])
+
+        self.assertTrue(
+            self.render_map_settings_check(
+                'negative_buffer_extent',
+                'negative_buffer_extent',
+                mapsettings
+            )
+        )
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/testdata/control_images/vectorlayerrenderer/expected_buffer_extent/expected_buffer_extent.png b/tests/testdata/control_images/vectorlayerrenderer/expected_buffer_extent/expected_buffer_extent.png
new file mode 100644
index 0000000000000000000000000000000000000000..9380ffb80814e74628dd2c91d176bf825b8b93aa
GIT binary patch
literal 4825
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

literal 0
HcmV?d00001

diff --git a/tests/testdata/control_images/vectorlayerrenderer/expected_buffer_extent_zero/expected_buffer_extent_zero.png b/tests/testdata/control_images/vectorlayerrenderer/expected_buffer_extent_zero/expected_buffer_extent_zero.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff30b65d25a48330cdc1a89fb396051d71e8e90a
GIT binary patch
literal 3618
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
SrUHKYAQ#Q7V3f12F~0%@h_9Fc

literal 0
HcmV?d00001

diff --git a/tests/testdata/control_images/vectorlayerrenderer/expected_negative_buffer_extent/expected_negative_buffer_extent.png b/tests/testdata/control_images/vectorlayerrenderer/expected_negative_buffer_extent/expected_negative_buffer_extent.png
new file mode 100644
index 0000000000000000000000000000000000000000..8332ebb02fe6747706e5a4f38308dbcd2bfce895
GIT binary patch
literal 9219
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

literal 0
HcmV?d00001


From 2b93d96aedfb59242ab5b88e503114b46ed1f3b6 Mon Sep 17 00:00:00 2001
From: Juho Ervasti <juho.ervasti@gispo.fi>
Date: Thu, 5 Dec 2024 14:28:46 +0200
Subject: [PATCH 06/15] Add test for loading symbol with extent buffer

---
 tests/src/python/test_qgssymbollayerutils.py | 57 ++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/tests/src/python/test_qgssymbollayerutils.py b/tests/src/python/test_qgssymbollayerutils.py
index b4a1127e291a..bb55da07ab53 100644
--- a/tests/src/python/test_qgssymbollayerutils.py
+++ b/tests/src/python/test_qgssymbollayerutils.py
@@ -31,6 +31,7 @@
     QgsSimpleFillSymbolLayer,
     QgsSimpleLineSymbolLayer,
     QgsSingleSymbolRenderer,
+    QgsSymbol,
     QgsSymbolLayer,
     QgsSymbolLayerUtils,
     QgsUnitTypes,
@@ -1253,6 +1254,62 @@ def test_font_marker_load(self):
         font_marker = QgsSymbolLayerUtils.loadSymbol(elem, QgsReadWriteContext())
         self.assertEqual(font_marker.symbolLayers()[0].character(), "()")
 
+    def test_extent_buffer_load(self):
+        doc = QDomDocument()
+        elem = QDomElement()
+
+        extent_buffer_xml_string = """<symbol is_animated="0" name="0" type="fill" alpha="1" clip_to_extent="1" force_rhr="0" frame_rate="10" extent_buffer="1000">
+  <data_defined_properties>
+  <Option type="Map">
+   <Option value="" name="name" type="QString"/>
+   <Option name="properties" type="Map">
+    <Option name="extent_buffer" type="Map">
+     <Option value="true" name="active" type="bool"/>
+     <Option value="if(@map_scale &lt;= 25000, 5000, 10000)" name="expression" type="QString"/>
+     <Option value="3" name="type" type="int"/>
+    </Option>
+   </Option>
+   <Option value="collection" name="type" type="QString"/>
+  </Option>
+ </data_defined_properties>
+ <layer pass="0" id="{2aefc556-4eb1-4f56-b96b-e1dea6b58f69}" locked="0" class="FontMarker" enabled="1">
+  <Option type="Map">
+   <Option value="0" type="QString" name="angle"/>
+   <Option value="~!_#!#_!~40~!_#!#_!~~!_#!#_!~41~!_#!#_!~" type="QString" name="chr"/>
+   <Option value="0,0,255,255" type="QString" name="color"/>
+   <Option value="Arial" type="QString" name="font"/>
+   <Option value="Italic" type="QString" name="font_style"/>
+   <Option value="1" type="QString" name="horizontal_anchor_point"/>
+   <Option value="miter" type="QString" name="joinstyle"/>
+   <Option value="0,0" type="QString" name="offset"/>
+   <Option value="3x:0,0,0,0,0,0" type="QString" name="offset_map_unit_scale"/>
+   <Option value="Point" type="QString" name="offset_unit"/>
+   <Option value="255,255,255,255" type="QString" name="outline_color"/>
+   <Option value="0" type="QString" name="outline_width"/>
+   <Option value="3x:0,0,0,0,0,0" type="QString" name="outline_width_map_unit_scale"/>
+   <Option value="MM" type="QString" name="outline_width_unit"/>
+   <Option value="42.4" type="QString" name="size"/>
+   <Option value="3x:0,0,0,0,0,0" type="QString" name="size_map_unit_scale"/>
+   <Option value="Point" type="QString" name="size_unit"/>
+   <Option value="1" type="QString" name="vertical_anchor_point"/>
+  </Option>
+ </layer>
+</symbol>"""
+
+        doc.setContent(extent_buffer_xml_string)
+        elem = doc.documentElement()
+        symbol = QgsSymbolLayerUtils.loadSymbol(elem, QgsReadWriteContext())
+        self.assertEqual(symbol.extentBuffer(), 1000)
+
+        property = symbol.dataDefinedProperties().property(
+            QgsSymbol.Property.ExtentBuffer
+        )
+
+        self.assertTrue(property.isActive())
+        self.assertEqual(
+            property.expressionString(), "if(@map_scale <= 25000, 5000, 10000)"
+        )
+
     def test_collect_symbol_layer_clip_geometries(self):
         """
         Test logic relating to symbol layer clip geometries.

From f25a33b846f47d53ef8e82e66ef10c0884e7f70c Mon Sep 17 00:00:00 2001
From: Juho Ervasti <juho.ervasti@gispo.fi>
Date: Thu, 5 Dec 2024 14:31:08 +0200
Subject: [PATCH 07/15] Fix style

---
 .../auto_generated/symbology/qgssymbol.sip.in |  8 ++--
 .../auto_generated/symbology/qgssymbol.sip.in |  8 ++--
 src/core/symbology/qgssymbol.h                |  4 +-
 .../test_qgscategorizedsymbolrenderer.py      |  1 +
 .../src/python/test_qgsvectorlayerrenderer.py | 38 +++++++++++--------
 5 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
index 8f3a64d9858b..3a721d1779e5 100644
--- a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
@@ -870,20 +870,20 @@ Internally, this notifies all symbol layers which were used via a call to
 %Docstring
 Returns the symbol's extent buffer.
 
-.. versionadded:: 3.42
-
 :return: The symbol's extent buffer
+
+.. versionadded:: 3.42
 %End
 
     void setExtentBuffer( double extentBuffer );
 %Docstring
 Sets the symbol's extent buffer.
 
-.. versionadded:: 3.42
-
 :param extentBuffer: buffer distance in map units
 
 .. seealso:: :py:func:`extentBuffer`
+
+.. versionadded:: 3.42
 %End
 
   protected:
diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in
index 488e3d512e86..d67493cb2043 100644
--- a/python/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/core/auto_generated/symbology/qgssymbol.sip.in
@@ -870,20 +870,20 @@ Internally, this notifies all symbol layers which were used via a call to
 %Docstring
 Returns the symbol's extent buffer.
 
-.. versionadded:: 3.42
-
 :return: The symbol's extent buffer
+
+.. versionadded:: 3.42
 %End
 
     void setExtentBuffer( double extentBuffer );
 %Docstring
 Sets the symbol's extent buffer.
 
-.. versionadded:: 3.42
-
 :param extentBuffer: buffer distance in map units
 
 .. seealso:: :py:func:`extentBuffer`
+
+.. versionadded:: 3.42
 %End
 
   protected:
diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
index 3c8c1cb88e19..e112b6b49a53 100644
--- a/src/core/symbology/qgssymbol.h
+++ b/src/core/symbology/qgssymbol.h
@@ -871,17 +871,17 @@ class CORE_EXPORT QgsSymbol
     /**
      * Returns the symbol's extent buffer.
      *
-     * \since QGIS 3.42
      * \returns The symbol's extent buffer
+     * \since QGIS 3.42
      */
     double extentBuffer() const;
 
     /**
      * Sets the symbol's extent buffer.
      *
-     * \since QGIS 3.42
      * \param extentBuffer buffer distance in map units
      * \see extentBuffer()
+     * \since QGIS 3.42
      */
     void setExtentBuffer( double extentBuffer );
 
diff --git a/tests/src/python/test_qgscategorizedsymbolrenderer.py b/tests/src/python/test_qgscategorizedsymbolrenderer.py
index 21633dca57c5..3cb84fd7b5a1 100644
--- a/tests/src/python/test_qgscategorizedsymbolrenderer.py
+++ b/tests/src/python/test_qgscategorizedsymbolrenderer.py
@@ -1442,5 +1442,6 @@ def testMaximumExtentBuffer(self):
 
         self.assertEqual(renderer.maximumExtentBuffer(QgsRenderContext()), 20)
 
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/src/python/test_qgsvectorlayerrenderer.py b/tests/src/python/test_qgsvectorlayerrenderer.py
index eace39b992ad..515032ee554f 100644
--- a/tests/src/python/test_qgsvectorlayerrenderer.py
+++ b/tests/src/python/test_qgsvectorlayerrenderer.py
@@ -941,15 +941,21 @@ def createFeature(x: float, y: float) -> QgsFeature:
             return feat
 
         def createSymbol() -> QgsMarkerSymbol:
-            sym = QgsMarkerSymbol.createSimple({'color': '#33aa33', 'outline_style': 'no', 'size': '5'})
+            sym = QgsMarkerSymbol.createSimple(
+                {"color": "#33aa33", "outline_style": "no", "size": "5"}
+            )
             return sym
 
         def createGeometryGenerator() -> QgsGeometryGeneratorSymbolLayer:
             geomgen = QgsGeometryGeneratorSymbolLayer.create(
-                {'geometryModifier': 'make_point($x + if($x <= 0, 5, -5), $y)'}
+                {"geometryModifier": "make_point($x + if($x <= 0, 5, -5), $y)"}
             )
             geomgen.setSymbolType(QgsSymbol.SymbolType.Marker)
-            geomgen.setSubSymbol(QgsMarkerSymbol.createSimple({'color': '#ff00ff', 'outline_style': 'no', 'size': '6'}))
+            geomgen.setSubSymbol(
+                QgsMarkerSymbol.createSimple(
+                    {"color": "#ff00ff", "outline_style": "no", "size": "6"}
+                )
+            )
 
             return geomgen
 
@@ -975,14 +981,14 @@ def createGeometryGenerator() -> QgsGeometryGeneratorSymbolLayer:
         mapsettings = QgsMapSettings()
         mapsettings.setOutputSize(QSize(400, 400))
         mapsettings.setOutputDpi(96)
-        mapsettings.setDestinationCrs(QgsCoordinateReferenceSystem('EPSG:3857'))
+        mapsettings.setDestinationCrs(QgsCoordinateReferenceSystem("EPSG:3857"))
         mapsettings.setExtent(QgsRectangle(-10, -10, 10, 10))
         mapsettings.setLayers([point_layer])
 
         self.assertTrue(
             self.render_map_settings_check(
-                'buffer_extent_zero',
-                'buffer_extent_zero',
+                "buffer_extent_zero",
+                "buffer_extent_zero",
                 mapsettings,
             )
         )
@@ -996,17 +1002,19 @@ def createGeometryGenerator() -> QgsGeometryGeneratorSymbolLayer:
 
         self.assertTrue(
             self.render_map_settings_check(
-                'buffer_extent',
-                'buffer_extent',
+                "buffer_extent",
+                "buffer_extent",
                 mapsettings,
             )
         )
 
     def testRenderWithExtentBufferNegative(self):
-        poly_layer = QgsVectorLayer(os.path.join(TEST_DATA_DIR, 'polys.shp'))
+        poly_layer = QgsVectorLayer(os.path.join(TEST_DATA_DIR, "polys.shp"))
         self.assertTrue(poly_layer.isValid())
 
-        sym1 = QgsFillSymbol.createSimple({'color': '#ff00ff', 'outline_color': '#000000', 'outline_width': '1'})
+        sym1 = QgsFillSymbol.createSimple(
+            {"color": "#ff00ff", "outline_color": "#000000", "outline_width": "1"}
+        )
         sym1.setExtentBuffer(-13.5)
 
         renderer = QgsSingleSymbolRenderer(sym1)
@@ -1015,15 +1023,15 @@ def testRenderWithExtentBufferNegative(self):
         mapsettings = QgsMapSettings()
         mapsettings.setOutputSize(QSize(400, 400))
         mapsettings.setOutputDpi(96)
-        mapsettings.setDestinationCrs(QgsCoordinateReferenceSystem('EPSG:3857'))
-        mapsettings.setExtent(QgsRectangle(-13875783.2, 2266009.4, -8690110.7, 6673344.5))
+        mapsettings.setDestinationCrs(QgsCoordinateReferenceSystem("EPSG:3857"))
+        mapsettings.setExtent(
+            QgsRectangle(-13875783.2, 2266009.4, -8690110.7, 6673344.5)
+        )
         mapsettings.setLayers([poly_layer])
 
         self.assertTrue(
             self.render_map_settings_check(
-                'negative_buffer_extent',
-                'negative_buffer_extent',
-                mapsettings
+                "negative_buffer_extent", "negative_buffer_extent", mapsettings
             )
         )
 

From 75a6562fd1a5467d4b89b66f953e8808a29b48cf Mon Sep 17 00:00:00 2001
From: Juho Ervasti <juho.ervasti@gispo.fi>
Date: Thu, 5 Dec 2024 14:31:16 +0200
Subject: [PATCH 08/15] Add a way to change extent buffer in the GUI

---
 src/gui/CMakeLists.txt                      |   2 +
 src/gui/symbology/qgsextentbufferdialog.cpp | 128 +++++++++++++++++++
 src/gui/symbology/qgsextentbufferdialog.h   | 135 ++++++++++++++++++++
 src/gui/symbology/qgssymbolslistwidget.cpp  |  46 +++++++
 src/gui/symbology/qgssymbolslistwidget.h    |   2 +
 src/ui/qgsextentbufferdialogbase.ui         |  92 +++++++++++++
 6 files changed, 405 insertions(+)
 create mode 100644 src/gui/symbology/qgsextentbufferdialog.cpp
 create mode 100644 src/gui/symbology/qgsextentbufferdialog.h
 create mode 100644 src/ui/qgsextentbufferdialogbase.ui

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 9e9aa88fa51e..a150742dd2a3 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -80,6 +80,7 @@ set(QGIS_GUI_SRCS
   symbology/qgssymbolbuffersettingswidget.cpp
   symbology/qgssymbollayerwidget.cpp
   symbology/qgssymbollevelsdialog.cpp
+  symbology/qgsextentbufferdialog.cpp
   symbology/qgssymbolslistwidget.cpp
   symbology/qgssymbolselectordialog.cpp
   symbology/qgssymbolwidgetcontext.cpp
@@ -1551,6 +1552,7 @@ set(QGIS_GUI_HDRS
   symbology/qgssymbolbuffersettingswidget.h
   symbology/qgssymbollayerwidget.h
   symbology/qgssymbollevelsdialog.h
+  symbology/qgsextentbufferdialog.h
   symbology/qgssymbolselectordialog.h
   symbology/qgssymbolslistwidget.h
   symbology/qgssymbolwidgetcontext.h
diff --git a/src/gui/symbology/qgsextentbufferdialog.cpp b/src/gui/symbology/qgsextentbufferdialog.cpp
new file mode 100644
index 000000000000..375ce66799bc
--- /dev/null
+++ b/src/gui/symbology/qgsextentbufferdialog.cpp
@@ -0,0 +1,128 @@
+/***************************************************************************
+    qgsextentbufferdialog.cpp
+    ---------------------
+    begin                : December 2024
+    copyright            : (C) 2024 by Juho Ervasti
+    email                : juho dot ervasti at gispo dot fi
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsextentbufferdialog.h"
+#include "moc_qgsextentbufferdialog.cpp"
+#include "qdialogbuttonbox.h"
+#include "qgsexpressioncontext.h"
+#include "qgshelp.h"
+#include "qgspanelwidget.h"
+#include "qgssymbol.h"
+#include "qgssymbolwidgetcontext.h"
+#include "qgsvectorlayer.h"
+
+QgsExtentBufferWidget::QgsExtentBufferWidget( QgsSymbol *symbol, QgsVectorLayer *layer, QWidget *parent )
+  : QgsPanelWidget( parent ), mSymbol( symbol ), mLayer( layer )
+{
+  setupUi( this );
+
+  mExtentBufferSpinBox->setValue( mSymbol-> extentBuffer() );
+
+  connect( mExtentBufferSpinBox, static_cast < void ( QgsDoubleSpinBox::* )( double ) > ( &QgsDoubleSpinBox::valueChanged ), this, [ = ]()
+  {
+    emit widgetChanged();
+  } );
+
+  registerDataDefinedButton( mExtentBufferDDButton, QgsSymbol::Property::ExtentBuffer );
+}
+
+QgsSymbolWidgetContext QgsExtentBufferWidget::context() const
+{
+  return mContext;
+}
+
+void QgsExtentBufferWidget::setContext( const QgsSymbolWidgetContext &context )
+{
+  mContext = context;
+}
+
+void QgsExtentBufferWidget::registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsSymbol::Property key )
+{
+  // pass in nullptr to avoid id, feature and geometry variables being added
+  // since the buffer is not evaluated per-feature
+  button->init( static_cast< int >( key ), mSymbol->dataDefinedProperties(), QgsSymbol::propertyDefinitions(), nullptr );
+  connect( button, &QgsPropertyOverrideButton::changed, this, [ = ]()
+  {
+    emit widgetChanged();
+  } );
+
+  button->registerExpressionContextGenerator( this );
+}
+
+QgsExpressionContext QgsExtentBufferWidget::createExpressionContext() const
+{
+  QList<QgsExpressionContextScope *> scopes = mContext.globalProjectAtlasMapLayerScopes( mLayer );
+  QgsExpressionContext expContext( scopes );
+
+  return expContext;
+}
+
+double QgsExtentBufferWidget::extentBuffer() const
+{
+  return mExtentBufferSpinBox->value();
+}
+
+QgsProperty QgsExtentBufferWidget::dataDefinedProperty() const
+{
+  return mExtentBufferDDButton->toProperty();
+}
+
+
+/// QgsExtentBufferDialog
+
+QgsExtentBufferDialog::QgsExtentBufferDialog( QgsSymbol *symbol, QgsVectorLayer *layer, QWidget *parent )
+  : QDialog( parent )
+{
+  QVBoxLayout *vLayout = new QVBoxLayout();
+  mWidget = new QgsExtentBufferWidget( symbol, layer );
+  vLayout->addWidget( mWidget );
+
+  QDialogButtonBox *bbox = new QDialogButtonBox( QDialogButtonBox::Cancel | QDialogButtonBox::Help | QDialogButtonBox::Ok, Qt::Horizontal );
+  connect( bbox, &QDialogButtonBox::accepted, this, &QgsExtentBufferDialog::accept );
+  connect( bbox, &QDialogButtonBox::rejected, this, &QgsExtentBufferDialog::reject );
+  connect( bbox, &QDialogButtonBox::helpRequested, this, &QgsExtentBufferDialog::showHelp );
+
+  vLayout->addWidget( bbox );
+  setLayout( vLayout );
+
+  setWindowTitle( tr( "Extent buffer" ) );
+}
+
+double QgsExtentBufferDialog::extentBuffer() const
+{
+  if ( !mWidget )
+    return 0;
+
+  return mWidget->extentBuffer();
+}
+
+QgsProperty QgsExtentBufferDialog::dataDefinedProperty() const
+{
+  if ( !mWidget )
+    return QgsProperty();
+
+  return mWidget->dataDefinedProperty();
+}
+
+QgsExtentBufferWidget *QgsExtentBufferDialog::widget() const
+{
+  return mWidget;
+}
+
+void QgsExtentBufferDialog::showHelp()
+{
+  QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#extent-buffer" ) );
+}
+
diff --git a/src/gui/symbology/qgsextentbufferdialog.h b/src/gui/symbology/qgsextentbufferdialog.h
new file mode 100644
index 000000000000..698b107e5aa7
--- /dev/null
+++ b/src/gui/symbology/qgsextentbufferdialog.h
@@ -0,0 +1,135 @@
+/***************************************************************************
+    qgsextentbufferdialog.h
+    ---------------------
+    begin                : December 2024
+    copyright            : (C) 2024 by Juho Ervasti
+    email                : juho dot ervasti at gispo dot fi
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef QGSEXTENTBUFFERDIALOG_H
+#define QGSEXTENTBUFFERDIALOG_H
+
+#define SIP_NO_FILE
+
+#include <QDialog>
+#include "qgis_sip.h"
+
+#include "qgssymbol.h"
+#include "qgssymbolwidgetcontext.h"
+#include "ui_qgsextentbufferdialogbase.h"
+#include "qgis_gui.h"
+
+class QgsVectorLayer;
+
+/**
+ * \class QgsExtentBufferWidget
+ * \ingroup gui
+ * \brief A widget which allows the user to modify the rendering order of extent buffers.
+ * \see QgsExtentBufferDialog
+ * \since QGIS 3.42
+ */
+class GUI_EXPORT QgsExtentBufferWidget : public QgsPanelWidget, public QgsExpressionContextGenerator, private Ui::QgsExtentBufferDialogBase
+{
+    Q_OBJECT
+  public:
+
+    /**
+     * Constructor for QgsExtentBufferWidget
+     */
+    QgsExtentBufferWidget( QgsSymbol *symbol, QgsVectorLayer *layer, QWidget *parent SIP_TRANSFERTHIS = nullptr );
+
+    /**
+     * Returns the extent buffer value currently set in the widget.
+     *
+     * \returns extent buffer value
+     */
+    double extentBuffer() const;
+
+    /**
+     * Returns the data defined property currently set in the widget.
+     *
+     * \returns property
+     */
+    QgsProperty dataDefinedProperty() const;
+
+    /**
+     * Sets the context in which widget is shown, e.g., the associated map canvas and expression contexts.
+     * \param context symbol widget context
+     * \see context()
+     */
+    void setContext( const QgsSymbolWidgetContext &context );
+
+    /**
+     * Returns the context in which the widget is shown, e.g., the associated map canvas and expression contexts.
+     * \see setContext()
+     */
+    QgsSymbolWidgetContext context() const;
+
+  private:
+    QgsSymbol *mSymbol = nullptr;
+    QgsVectorLayer *mLayer = nullptr;
+    QgsSymbolWidgetContext mContext;
+
+    QgsExpressionContext createExpressionContext() const override;
+
+    /**
+     * Registers a data defined override button. Handles setting up connections
+     * for the button and initializing the button to show the correct descriptions
+     * and help text for the associated property.
+     */
+    void registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsSymbol::Property key );
+};
+
+/**
+ * \class QgsExtentBufferDialog
+ * \ingroup gui
+ * \brief A dialog which allows the user to modify the extent buffer of a symbol.
+ * \since QGIS 3.42
+*/
+class GUI_EXPORT QgsExtentBufferDialog : public QDialog
+{
+    Q_OBJECT
+  public:
+
+    //! Constructor for QgsExtentBufferDialog.
+    QgsExtentBufferDialog( QgsSymbol *symbol, QgsVectorLayer *layer, QWidget *parent SIP_TRANSFERTHIS = nullptr );
+
+    /**
+     * Returns the extent buffer value currently set in the widget.
+     */
+    double extentBuffer() const;
+
+    /**
+     * Returns the extent buffer value currently set in the widget.
+     *
+     * \note returns 0 if widget does not exist
+     *
+     * \returns extent buffer value
+     */
+    QgsProperty dataDefinedProperty() const;
+
+    /**
+     * Returns the data defined property currently set in the widget.
+     *
+     * \note returns empty property if widget does not exist
+     *
+     * \returns property
+    */
+    QgsExtentBufferWidget *widget() const;
+
+  private:
+    QgsExtentBufferWidget *mWidget;
+
+  private slots:
+
+    void showHelp();
+
+};
+
+#endif // QGSEXTENTBUFFERDIALOG_H
diff --git a/src/gui/symbology/qgssymbolslistwidget.cpp b/src/gui/symbology/qgssymbolslistwidget.cpp
index fd047f8d00cb..76d08c506866 100644
--- a/src/gui/symbology/qgssymbolslistwidget.cpp
+++ b/src/gui/symbology/qgssymbolslistwidget.cpp
@@ -15,6 +15,7 @@
 
 #include "qgssymbolslistwidget.h"
 #include "moc_qgssymbolslistwidget.cpp"
+#include "qgsextentbufferdialog.h"
 #include "qgsstylesavedialog.h"
 #include "qgsstyleitemslistwidget.h"
 #include "qgsvectorlayer.h"
@@ -59,6 +60,9 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbol *symbol, QgsStyle *style,
   mAnimationSettingsAction = new QAction( tr( "Animation Settings…" ), this );
   connect( mAnimationSettingsAction, &QAction::triggered, this, &QgsSymbolsListWidget::showAnimationSettings );
 
+  mExtentBufferAction = new QAction( tr( "Extent buffer…" ), this );
+  connect( mExtentBufferAction, &QAction::triggered, this, &QgsSymbolsListWidget::showExtentBufferSettings );
+
   // select correct page in stacked widget
   QgsPropertyOverrideButton *opacityDDBtn = nullptr;
   switch ( symbol->type() )
@@ -148,6 +152,7 @@ QgsSymbolsListWidget::~QgsSymbolsListWidget()
   mStyleItemsListWidget->advancedMenu()->removeAction( mClipFeaturesAction );
   mStyleItemsListWidget->advancedMenu()->removeAction( mStandardizeRingsAction );
   mStyleItemsListWidget->advancedMenu()->removeAction( mAnimationSettingsAction );
+  mStyleItemsListWidget->advancedMenu()->removeAction( mExtentBufferAction );
   mStyleItemsListWidget->advancedMenu()->removeAction( mBufferSettingsAction );
 }
 
@@ -299,6 +304,45 @@ void QgsSymbolsListWidget::showAnimationSettings()
   }
 }
 
+void QgsSymbolsListWidget::showExtentBufferSettings()
+{
+  QgsPanelWidget *panel = QgsPanelWidget::findParentPanel( this );
+  if ( panel && panel->dockMode() )
+  {
+    QgsExtentBufferWidget *widget = new QgsExtentBufferWidget( mSymbol, mLayer, panel );
+    widget->setPanelTitle( tr( "Extent Buffer" ) );
+    widget->setContext( mContext );
+
+    connect( widget, &QgsPanelWidget::widgetChanged, this, [ = ]()
+    {
+      mSymbol->setExtentBuffer( widget->extentBuffer() );
+      mSymbol->setDataDefinedProperty( QgsSymbol::Property::ExtentBuffer, widget->dataDefinedProperty() );
+
+      emit changed();
+    } );
+
+    panel->openPanel( widget );
+
+  }
+  else
+  {
+    QgsExtentBufferDialog dlg( mSymbol, mLayer, panel );
+
+    if ( dlg.widget() )
+    {
+      dlg.widget()->setContext( mContext );
+    }
+
+    if ( dlg.exec() == QDialog::Accepted )
+    {
+      mSymbol->setExtentBuffer( dlg.extentBuffer() );
+      mSymbol->setDataDefinedProperty( QgsSymbol::Property::ExtentBuffer, dlg.dataDefinedProperty() );
+
+      emit changed();
+    }
+  }
+}
+
 void QgsSymbolsListWidget::showBufferSettings()
 {
   QgsPanelWidget *panel = QgsPanelWidget::findParentPanel( this );
@@ -613,6 +657,7 @@ void QgsSymbolsListWidget::updateSymbolInfo()
             mClipFeaturesAction,
             mStandardizeRingsAction,
             mAnimationSettingsAction,
+            mExtentBufferAction,
             mBufferSettingsAction
           } )
     {
@@ -638,6 +683,7 @@ void QgsSymbolsListWidget::updateSymbolInfo()
     mStyleItemsListWidget->advancedMenu()->addAction( mBufferSettingsAction );
   }
   mStyleItemsListWidget->advancedMenu()->addAction( mAnimationSettingsAction );
+  mStyleItemsListWidget->advancedMenu()->addAction( mExtentBufferAction );
 
   mStyleItemsListWidget->showAdvancedButton( mAdvancedMenu || !mStyleItemsListWidget->advancedMenu()->isEmpty() );
 
diff --git a/src/gui/symbology/qgssymbolslistwidget.h b/src/gui/symbology/qgssymbolslistwidget.h
index 719caac94263..60bc447d933c 100644
--- a/src/gui/symbology/qgssymbolslistwidget.h
+++ b/src/gui/symbology/qgssymbolslistwidget.h
@@ -98,6 +98,7 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW
     void createSymbolAuxiliaryField();
     void forceRHRToggled( bool checked );
     void showAnimationSettings();
+    void showExtentBufferSettings();
     void showBufferSettings();
     void saveSymbol();
     void updateSymbolDataDefinedProperty();
@@ -114,6 +115,7 @@ class GUI_EXPORT QgsSymbolsListWidget : public QWidget, private Ui::SymbolsListW
     QAction *mStandardizeRingsAction = nullptr;
     QAction *mBufferSettingsAction = nullptr;
     QAction *mAnimationSettingsAction = nullptr;
+    QAction *mExtentBufferAction = nullptr;
     QgsVectorLayer *mLayer = nullptr;
 
     QgsColorButton *mSymbolColorButton = nullptr;
diff --git a/src/ui/qgsextentbufferdialogbase.ui b/src/ui/qgsextentbufferdialogbase.ui
new file mode 100644
index 000000000000..6aa07ee35e16
--- /dev/null
+++ b/src/ui/qgsextentbufferdialogbase.ui
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QgsExtentBufferDialogBase</class>
+ <widget class="QgsPanelWidget" name="QgsExtentBufferDialogBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>406</width>
+    <height>337</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Symbol Levels</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Define an extent buffer distance in map units. The symbol will be rendered for features which are within the buffered map extent.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>Distance</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QgsDoubleSpinBox" name="mExtentBufferSpinBox">
+       <property name="minimum">
+        <double>-9999999999.000000000000000</double>
+       </property>
+       <property name="maximum">
+        <double>9999999999.000000000000000</double>
+       </property>
+       <property name="clearValue">
+        <bool>false</bool>
+       </property>
+       <property name="expressionsEnabled">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QgsPropertyOverrideButton" name="mExtentBufferDDButton"/>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>QgsDoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>qgsdoublespinbox.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsPropertyOverrideButton</class>
+   <extends>QToolButton</extends>
+   <header>qgspropertyoverridebutton.h</header>
+  </customwidget>
+  <customwidget>
+   <class>QgsPanelWidget</class>
+   <extends>QWidget</extends>
+   <header>qgspanelwidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

From 3c2952e414d95fa5b9d376e9f1bf63bd30d15414 Mon Sep 17 00:00:00 2001
From: Juho Ervasti <juho.ervasti@gispo.fi>
Date: Thu, 5 Dec 2024 14:44:52 +0200
Subject: [PATCH 09/15] Apply suggestions from review

---
 python/PyQt6/core/auto_generated/symbology/qgsrenderer.sip.in | 3 +--
 python/core/auto_generated/symbology/qgsrenderer.sip.in       | 3 +--
 src/core/symbology/qgsrenderer.cpp                            | 4 ++--
 src/core/symbology/qgsrenderer.h                              | 3 +--
 src/core/symbology/qgssymbol.cpp                              | 1 -
 src/core/symbology/qgssymbollayerutils.cpp                    | 3 ++-
 src/core/vector/qgsvectorlayerrenderer.cpp                    | 4 ++--
 src/gui/symbology/qgssymbolslistwidget.cpp                    | 2 +-
 8 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/python/PyQt6/core/auto_generated/symbology/qgsrenderer.sip.in b/python/PyQt6/core/auto_generated/symbology/qgsrenderer.sip.in
index d1820bf91d54..ae8f269ceb11 100644
--- a/python/PyQt6/core/auto_generated/symbology/qgsrenderer.sip.in
+++ b/python/PyQt6/core/auto_generated/symbology/qgsrenderer.sip.in
@@ -632,8 +632,7 @@ Currently clones
 
     double maximumExtentBuffer( QgsRenderContext &context ) const;
 %Docstring
-Returns the maximum extent buffer found in this renderer's
-symbols' symbol layers.
+Returns the maximum extent buffer found in this renderer's symbols.
 
 .. note::
 
diff --git a/python/core/auto_generated/symbology/qgsrenderer.sip.in b/python/core/auto_generated/symbology/qgsrenderer.sip.in
index a704df505a77..6bc3b4dca987 100644
--- a/python/core/auto_generated/symbology/qgsrenderer.sip.in
+++ b/python/core/auto_generated/symbology/qgsrenderer.sip.in
@@ -632,8 +632,7 @@ Currently clones
 
     double maximumExtentBuffer( QgsRenderContext &context ) const;
 %Docstring
-Returns the maximum extent buffer found in this renderer's
-symbols' symbol layers.
+Returns the maximum extent buffer found in this renderer's symbols.
 
 .. note::
 
diff --git a/src/core/symbology/qgsrenderer.cpp b/src/core/symbology/qgsrenderer.cpp
index ac3b980e8859..9596ac5c3454 100644
--- a/src/core/symbology/qgsrenderer.cpp
+++ b/src/core/symbology/qgsrenderer.cpp
@@ -431,9 +431,9 @@ double QgsFeatureRenderer::maximumExtentBuffer( QgsRenderContext &context ) cons
   {
     const QgsProperty property = sym->dataDefinedProperties().property( QgsSymbol::Property::ExtentBuffer );
 
-    if ( property.isActive() && ! property.expressionString().isEmpty() )
+    if ( property.isActive() )
     {
-      return sym->dataDefinedProperties().valueAsDouble( QgsSymbol::Property::ExtentBuffer, expContext );
+      return sym->dataDefinedProperties().valueAsDouble( QgsSymbol::Property::ExtentBuffer, expContext, sym->extentBuffer() );
     }
 
     return sym->extentBuffer();
diff --git a/src/core/symbology/qgsrenderer.h b/src/core/symbology/qgsrenderer.h
index 431a8635ca9c..eaaa60cb8f8c 100644
--- a/src/core/symbology/qgsrenderer.h
+++ b/src/core/symbology/qgsrenderer.h
@@ -654,8 +654,7 @@ class CORE_EXPORT QgsFeatureRenderer
     void copyRendererData( QgsFeatureRenderer *destRenderer ) const;
 
     /**
-     * Returns the maximum extent buffer found in this renderer's
-     * symbols' symbol layers.
+     * Returns the maximum extent buffer found in this renderer's symbols.
      *
      * \note Returns 0 if the renderer doesn't have any symbols.
      * \since QGIS 3.42
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
index 01b0635cd929..7f19c519bed0 100644
--- a/src/core/symbology/qgssymbol.cpp
+++ b/src/core/symbology/qgssymbol.cpp
@@ -20,7 +20,6 @@
 #include <QSvgGenerator>
 #include <QPicture>
 
-#include <algorithm>
 #include <cmath>
 #include <map>
 #include <random>
diff --git a/src/core/symbology/qgssymbollayerutils.cpp b/src/core/symbology/qgssymbollayerutils.cpp
index df7bcc65e933..e208010b3577 100644
--- a/src/core/symbology/qgssymbollayerutils.cpp
+++ b/src/core/symbology/qgssymbollayerutils.cpp
@@ -1453,7 +1453,8 @@ QDomElement QgsSymbolLayerUtils::saveSymbol( const QString &name, const QgsSymbo
   symEl.setAttribute( QStringLiteral( "name" ), name );
   symEl.setAttribute( QStringLiteral( "alpha" ), QString::number( symbol->opacity() ) );
   symEl.setAttribute( QStringLiteral( "clip_to_extent" ), symbol->clipFeaturesToExtent() ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
-  symEl.setAttribute( QStringLiteral( "extent_buffer" ), QString::number( symbol->extentBuffer() ) );
+  if ( !qgsDoubleNear( symbol->extentBuffer(), 0 ) )
+    symEl.setAttribute( QStringLiteral( "extent_buffer" ), QString::number( symbol->extentBuffer() ) );
   symEl.setAttribute( QStringLiteral( "force_rhr" ), symbol->forceRHR() ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
   if ( symbol->flags() & Qgis::SymbolFlag::RendererShouldUseSymbolLevels )
     symEl.setAttribute( QStringLiteral( "renderer_should_use_levels" ), QStringLiteral( "1" ) );
diff --git a/src/core/vector/qgsvectorlayerrenderer.cpp b/src/core/vector/qgsvectorlayerrenderer.cpp
index 69048c0f0c26..d689ad953dc2 100644
--- a/src/core/vector/qgsvectorlayerrenderer.cpp
+++ b/src/core/vector/qgsvectorlayerrenderer.cpp
@@ -363,10 +363,10 @@ bool QgsVectorLayerRenderer::renderInternal( QgsFeatureRenderer *renderer, int r
 
   if ( maximumExtentBuffer != 0 )
   {
-    bool bufferDisappearsExtent = maximumExtentBuffer < 0 && ( requestExtent.width() + ( maximumExtentBuffer * 2 ) < 0 || requestExtent.height() + ( maximumExtentBuffer * 2 ) < 0 );
+    bool bufferCausesEmptyExtent = maximumExtentBuffer < 0 && ( requestExtent.width() + ( maximumExtentBuffer * 2 ) < 0 || requestExtent.height() + ( maximumExtentBuffer * 2 ) < 0 );
 
     // nothing to draw
-    if ( bufferDisappearsExtent )
+    if ( bufferCausesEmptyExtent )
     {
       renderer->stopRender( context );
       return true;
diff --git a/src/gui/symbology/qgssymbolslistwidget.cpp b/src/gui/symbology/qgssymbolslistwidget.cpp
index 76d08c506866..c6913af68328 100644
--- a/src/gui/symbology/qgssymbolslistwidget.cpp
+++ b/src/gui/symbology/qgssymbolslistwidget.cpp
@@ -60,7 +60,7 @@ QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbol *symbol, QgsStyle *style,
   mAnimationSettingsAction = new QAction( tr( "Animation Settings…" ), this );
   connect( mAnimationSettingsAction, &QAction::triggered, this, &QgsSymbolsListWidget::showAnimationSettings );
 
-  mExtentBufferAction = new QAction( tr( "Extent buffer…" ), this );
+  mExtentBufferAction = new QAction( tr( "Extent Buffer…" ), this );
   connect( mExtentBufferAction, &QAction::triggered, this, &QgsSymbolsListWidget::showExtentBufferSettings );
 
   // select correct page in stacked widget

From c103bb2fe84f950ab20b06e88313c2ad0f210952 Mon Sep 17 00:00:00 2001
From: Juho Ervasti <juho.ervasti@gispo.fi>
Date: Thu, 5 Dec 2024 15:48:38 +0200
Subject: [PATCH 10/15] Disallow negative buffer

---
 .../auto_generated/symbology/qgssymbol.sip.in |   4 +++
 .../auto_generated/symbology/qgssymbol.sip.in |   4 +++
 src/core/symbology/qgsrenderer.cpp            |   5 ++--
 src/core/symbology/qgssymbol.cpp              |   5 +++-
 src/core/symbology/qgssymbol.h                |   1 +
 src/core/vector/qgsvectorlayerrenderer.cpp    |  17 -----------
 src/ui/qgsextentbufferdialogbase.ui           |   4 +--
 tests/src/python/test_qgssymbol.py            |   3 ++
 .../src/python/test_qgsvectorlayerrenderer.py |  27 ------------------
 .../expected_negative_buffer_extent.png       | Bin 9219 -> 0 bytes
 10 files changed, 21 insertions(+), 49 deletions(-)
 delete mode 100644 tests/testdata/control_images/vectorlayerrenderer/expected_negative_buffer_extent/expected_negative_buffer_extent.png

diff --git a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
index 3a721d1779e5..484d03a0df09 100644
--- a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
@@ -883,6 +883,10 @@ Sets the symbol's extent buffer.
 
 .. seealso:: :py:func:`extentBuffer`
 
+.. note::
+
+   Negative values are not supported and will be changed to 0.
+
 .. versionadded:: 3.42
 %End
 
diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in
index d67493cb2043..2152b57fa750 100644
--- a/python/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/core/auto_generated/symbology/qgssymbol.sip.in
@@ -883,6 +883,10 @@ Sets the symbol's extent buffer.
 
 .. seealso:: :py:func:`extentBuffer`
 
+.. note::
+
+   Negative values are not supported and will be changed to 0.
+
 .. versionadded:: 3.42
 %End
 
diff --git a/src/core/symbology/qgsrenderer.cpp b/src/core/symbology/qgsrenderer.cpp
index 9596ac5c3454..58d683c7b402 100644
--- a/src/core/symbology/qgsrenderer.cpp
+++ b/src/core/symbology/qgsrenderer.cpp
@@ -525,8 +525,9 @@ QgsSymbolList QgsFeatureRenderer::symbolsForFeature( const QgsFeature &feature,
 
 void QgsFeatureRenderer::modifyRequestExtent( QgsRectangle &extent, QgsRenderContext &context )
 {
-  Q_UNUSED( extent )
-  Q_UNUSED( context )
+  double extentBuffer = maximumExtentBuffer( context );
+
+  extent.grow( extentBuffer );
 }
 
 QgsSymbolList QgsFeatureRenderer::originalSymbolsForFeature( const QgsFeature &feature, QgsRenderContext &context ) const
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
index 7f19c519bed0..2ba180a1a726 100644
--- a/src/core/symbology/qgssymbol.cpp
+++ b/src/core/symbology/qgssymbol.cpp
@@ -2231,7 +2231,10 @@ double QgsSymbol::extentBuffer() const
 
 void QgsSymbol::setExtentBuffer( double extentBuffer )
 {
-  mExtentBuffer = extentBuffer;
+  if ( extentBuffer < 0 )
+    mExtentBuffer = 0;
+  else
+    mExtentBuffer = extentBuffer;
 }
 
 
diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
index e112b6b49a53..5302f35d1226 100644
--- a/src/core/symbology/qgssymbol.h
+++ b/src/core/symbology/qgssymbol.h
@@ -881,6 +881,7 @@ class CORE_EXPORT QgsSymbol
      *
      * \param extentBuffer buffer distance in map units
      * \see extentBuffer()
+     * \note Negative values are not supported and will be changed to 0.
      * \since QGIS 3.42
      */
     void setExtentBuffer( double extentBuffer );
diff --git a/src/core/vector/qgsvectorlayerrenderer.cpp b/src/core/vector/qgsvectorlayerrenderer.cpp
index d689ad953dc2..22ede9519769 100644
--- a/src/core/vector/qgsvectorlayerrenderer.cpp
+++ b/src/core/vector/qgsvectorlayerrenderer.cpp
@@ -356,25 +356,8 @@ bool QgsVectorLayerRenderer::renderInternal( QgsFeatureRenderer *renderer, int r
       mDiagramProvider->setClipFeatureGeometry( mLabelClipFeatureGeom );
   }
 
-
   renderer->modifyRequestExtent( requestExtent, context );
 
-  double maximumExtentBuffer = renderer->maximumExtentBuffer( context );
-
-  if ( maximumExtentBuffer != 0 )
-  {
-    bool bufferCausesEmptyExtent = maximumExtentBuffer < 0 && ( requestExtent.width() + ( maximumExtentBuffer * 2 ) < 0 || requestExtent.height() + ( maximumExtentBuffer * 2 ) < 0 );
-
-    // nothing to draw
-    if ( bufferCausesEmptyExtent )
-    {
-      renderer->stopRender( context );
-      return true;
-    }
-
-    requestExtent = requestExtent.buffered( maximumExtentBuffer );
-  }
-
   QgsFeatureRequest featureRequest = QgsFeatureRequest()
                                      .setFilterRect( requestExtent )
                                      .setSubsetOfAttributes( mAttrNames, mFields )
diff --git a/src/ui/qgsextentbufferdialogbase.ui b/src/ui/qgsextentbufferdialogbase.ui
index 6aa07ee35e16..bdd16d9d4184 100644
--- a/src/ui/qgsextentbufferdialogbase.ui
+++ b/src/ui/qgsextentbufferdialogbase.ui
@@ -36,10 +36,10 @@
      <item>
       <widget class="QgsDoubleSpinBox" name="mExtentBufferSpinBox">
        <property name="minimum">
-        <double>-9999999999.000000000000000</double>
+        <double>0</double>
        </property>
        <property name="maximum">
-        <double>9999999999.000000000000000</double>
+        <double>999999999.000000000000000</double>
        </property>
        <property name="clearValue">
         <bool>false</bool>
diff --git a/tests/src/python/test_qgssymbol.py b/tests/src/python/test_qgssymbol.py
index bc9c814aa3d2..26b626a572af 100644
--- a/tests/src/python/test_qgssymbol.py
+++ b/tests/src/python/test_qgssymbol.py
@@ -928,6 +928,9 @@ def test_extent_buffer(self):
         s.setExtentBuffer(10)
         self.assertEqual(s.extentBuffer(), 10)
 
+        s.setExtentBuffer(-10)
+        self.assertEqual(s.extentBuffer(), 0)
+
     def renderCollection(self, geom, symbol):
         f = QgsFeature()
         f.setGeometry(geom)
diff --git a/tests/src/python/test_qgsvectorlayerrenderer.py b/tests/src/python/test_qgsvectorlayerrenderer.py
index 515032ee554f..d1586c0f4603 100644
--- a/tests/src/python/test_qgsvectorlayerrenderer.py
+++ b/tests/src/python/test_qgsvectorlayerrenderer.py
@@ -1008,33 +1008,6 @@ def createGeometryGenerator() -> QgsGeometryGeneratorSymbolLayer:
             )
         )
 
-    def testRenderWithExtentBufferNegative(self):
-        poly_layer = QgsVectorLayer(os.path.join(TEST_DATA_DIR, "polys.shp"))
-        self.assertTrue(poly_layer.isValid())
-
-        sym1 = QgsFillSymbol.createSimple(
-            {"color": "#ff00ff", "outline_color": "#000000", "outline_width": "1"}
-        )
-        sym1.setExtentBuffer(-13.5)
-
-        renderer = QgsSingleSymbolRenderer(sym1)
-        poly_layer.setRenderer(renderer)
-
-        mapsettings = QgsMapSettings()
-        mapsettings.setOutputSize(QSize(400, 400))
-        mapsettings.setOutputDpi(96)
-        mapsettings.setDestinationCrs(QgsCoordinateReferenceSystem("EPSG:3857"))
-        mapsettings.setExtent(
-            QgsRectangle(-13875783.2, 2266009.4, -8690110.7, 6673344.5)
-        )
-        mapsettings.setLayers([poly_layer])
-
-        self.assertTrue(
-            self.render_map_settings_check(
-                "negative_buffer_extent", "negative_buffer_extent", mapsettings
-            )
-        )
-
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/tests/testdata/control_images/vectorlayerrenderer/expected_negative_buffer_extent/expected_negative_buffer_extent.png b/tests/testdata/control_images/vectorlayerrenderer/expected_negative_buffer_extent/expected_negative_buffer_extent.png
deleted file mode 100644
index 8332ebb02fe6747706e5a4f38308dbcd2bfce895..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9219
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


From 97b9fc7703d1161e20a7f9c063d470aacae9f142 Mon Sep 17 00:00:00 2001
From: Juho Ervasti <juho.ervasti@gispo.fi>
Date: Thu, 5 Dec 2024 19:34:22 +0200
Subject: [PATCH 11/15] Add unit selection for extent buffer

---
 .../auto_generated/symbology/qgssymbol.sip.in | 16 +++++++++-
 .../auto_generated/symbology/qgssymbol.sip.in | 16 +++++++++-
 src/core/symbology/qgsrenderer.cpp            | 17 ++++++++--
 src/core/symbology/qgssymbol.cpp              |  1 +
 src/core/symbology/qgssymbol.h                | 17 +++++++++-
 src/core/symbology/qgssymbollayerutils.cpp    |  4 +++
 src/gui/symbology/qgsextentbufferdialog.cpp   | 32 +++++++++++++++++--
 src/gui/symbology/qgsextentbufferdialog.h     | 11 +++++++
 src/gui/symbology/qgssymbolslistwidget.cpp    |  2 ++
 src/ui/qgsextentbufferdialogbase.ui           | 13 ++++++--
 10 files changed, 119 insertions(+), 10 deletions(-)

diff --git a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
index 484d03a0df09..0495714b5624 100644
--- a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
@@ -879,7 +879,7 @@ Returns the symbol's extent buffer.
 %Docstring
 Sets the symbol's extent buffer.
 
-:param extentBuffer: buffer distance in map units
+:param extentBuffer: buffer distance.
 
 .. seealso:: :py:func:`extentBuffer`
 
@@ -888,6 +888,20 @@ Sets the symbol's extent buffer.
    Negative values are not supported and will be changed to 0.
 
 .. versionadded:: 3.42
+%End
+
+    Qgis::RenderUnit extentBufferSizeUnit() const;
+%Docstring
+Returns the units for the buffer size.
+
+.. seealso:: :py:func:`setExtentBufferSizeUnit`
+%End
+
+    void setExtentBufferSizeUnit( Qgis::RenderUnit unit );
+%Docstring
+Sets the ``unit`` used for the extent buffer.
+
+.. seealso:: :py:func:`extentBufferSizeUnit`
 %End
 
   protected:
diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in
index 2152b57fa750..ca7a0ab5c81d 100644
--- a/python/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/core/auto_generated/symbology/qgssymbol.sip.in
@@ -879,7 +879,7 @@ Returns the symbol's extent buffer.
 %Docstring
 Sets the symbol's extent buffer.
 
-:param extentBuffer: buffer distance in map units
+:param extentBuffer: buffer distance.
 
 .. seealso:: :py:func:`extentBuffer`
 
@@ -888,6 +888,20 @@ Sets the symbol's extent buffer.
    Negative values are not supported and will be changed to 0.
 
 .. versionadded:: 3.42
+%End
+
+    Qgis::RenderUnit extentBufferSizeUnit() const;
+%Docstring
+Returns the units for the buffer size.
+
+.. seealso:: :py:func:`setExtentBufferSizeUnit`
+%End
+
+    void setExtentBufferSizeUnit( Qgis::RenderUnit unit );
+%Docstring
+Sets the ``unit`` used for the extent buffer.
+
+.. seealso:: :py:func:`extentBufferSizeUnit`
 %End
 
   protected:
diff --git a/src/core/symbology/qgsrenderer.cpp b/src/core/symbology/qgsrenderer.cpp
index 58d683c7b402..361fcf15c82a 100644
--- a/src/core/symbology/qgsrenderer.cpp
+++ b/src/core/symbology/qgsrenderer.cpp
@@ -427,16 +427,27 @@ double QgsFeatureRenderer::maximumExtentBuffer( QgsRenderContext &context ) cons
 
   const QgsExpressionContext &expContext = context.expressionContext();
 
-  auto getValueFromSymbol = [ &expContext ]( const QgsSymbol * sym ) -> double
+  auto getValueFromSymbol = [ &expContext, &context ]( const QgsSymbol * sym ) -> double
   {
     const QgsProperty property = sym->dataDefinedProperties().property( QgsSymbol::Property::ExtentBuffer );
 
+    double value = 0.0;
+
     if ( property.isActive() )
     {
-      return sym->dataDefinedProperties().valueAsDouble( QgsSymbol::Property::ExtentBuffer, expContext, sym->extentBuffer() );
+      value = sym->dataDefinedProperties().valueAsDouble( QgsSymbol::Property::ExtentBuffer, expContext, sym->extentBuffer() );
+    }
+    else
+    {
+      value = sym->extentBuffer();
+    }
+
+    if ( sym->extentBufferSizeUnit() != Qgis::RenderUnit::MapUnits )
+    {
+      value = context.convertToMapUnits( value, sym->extentBufferSizeUnit(), sym->mapUnitScale() );
     }
 
-    return sym->extentBuffer();
+    return value;
   };
 
   if ( symbolList.size() == 1 )
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
index 2ba180a1a726..d6e3d15228c5 100644
--- a/src/core/symbology/qgssymbol.cpp
+++ b/src/core/symbology/qgssymbol.cpp
@@ -2315,6 +2315,7 @@ void QgsSymbol::copyCommonProperties( const QgsSymbol *other )
   mSymbolFlags = other->mSymbolFlags;
   mAnimationSettings = other->mAnimationSettings;
   mExtentBuffer = other->mExtentBuffer;
+  mExtentBufferSizeUnit = other->mExtentBufferSizeUnit;
   if ( other->mBufferSettings )
     mBufferSettings = std::make_unique< QgsSymbolBufferSettings >( *other->mBufferSettings );
   else
diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
index 5302f35d1226..ccadef984fbf 100644
--- a/src/core/symbology/qgssymbol.h
+++ b/src/core/symbology/qgssymbol.h
@@ -879,13 +879,27 @@ class CORE_EXPORT QgsSymbol
     /**
      * Sets the symbol's extent buffer.
      *
-     * \param extentBuffer buffer distance in map units
+     * \param extentBuffer buffer distance.
      * \see extentBuffer()
      * \note Negative values are not supported and will be changed to 0.
      * \since QGIS 3.42
      */
     void setExtentBuffer( double extentBuffer );
 
+    /**
+     * Returns the units for the buffer size.
+     *
+     * \see setExtentBufferSizeUnit()
+     */
+    Qgis::RenderUnit extentBufferSizeUnit() const { return mExtentBufferSizeUnit; }
+
+    /**
+     * Sets the \a unit used for the extent buffer.
+     *
+     * \see extentBufferSizeUnit()
+     */
+    void setExtentBufferSizeUnit( Qgis::RenderUnit unit ) { mExtentBufferSizeUnit = unit; }
+
   protected:
 
     /**
@@ -975,6 +989,7 @@ class CORE_EXPORT QgsSymbol
     QgsSymbolLayerList mLayers;
 
     double mExtentBuffer = 0;
+    Qgis::RenderUnit mExtentBufferSizeUnit = Qgis::RenderUnit::MapUnits;
 
     //! Symbol opacity (in the range 0 - 1)
     qreal mOpacity = 1.0;
diff --git a/src/core/symbology/qgssymbollayerutils.cpp b/src/core/symbology/qgssymbollayerutils.cpp
index e208010b3577..c2b5ed72e94c 100644
--- a/src/core/symbology/qgssymbollayerutils.cpp
+++ b/src/core/symbology/qgssymbollayerutils.cpp
@@ -1335,6 +1335,7 @@ QgsSymbol *QgsSymbolLayerUtils::loadSymbol( const QDomElement &element, const Qg
   }
   symbol->setOpacity( element.attribute( QStringLiteral( "alpha" ), QStringLiteral( "1.0" ) ).toDouble() );
   symbol->setExtentBuffer( element.attribute( QStringLiteral( "extent_buffer" ), QStringLiteral( "0.0" ) ).toDouble() );
+  symbol->setExtentBufferSizeUnit( QgsUnitTypes::decodeRenderUnit( element.attribute( QStringLiteral( "extent_buffer_unit" ), QStringLiteral( "MapUnit" ) ) ) );
   symbol->setClipFeaturesToExtent( element.attribute( QStringLiteral( "clip_to_extent" ), QStringLiteral( "1" ) ).toInt() );
   symbol->setForceRHR( element.attribute( QStringLiteral( "force_rhr" ), QStringLiteral( "0" ) ).toInt() );
   Qgis::SymbolFlags flags;
@@ -1454,7 +1455,10 @@ QDomElement QgsSymbolLayerUtils::saveSymbol( const QString &name, const QgsSymbo
   symEl.setAttribute( QStringLiteral( "alpha" ), QString::number( symbol->opacity() ) );
   symEl.setAttribute( QStringLiteral( "clip_to_extent" ), symbol->clipFeaturesToExtent() ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
   if ( !qgsDoubleNear( symbol->extentBuffer(), 0 ) )
+  {
     symEl.setAttribute( QStringLiteral( "extent_buffer" ), QString::number( symbol->extentBuffer() ) );
+    symEl.setAttribute( QStringLiteral( "extent_buffer_unit" ), QgsUnitTypes::encodeUnit( symbol->extentBufferSizeUnit() ) );
+  }
   symEl.setAttribute( QStringLiteral( "force_rhr" ), symbol->forceRHR() ? QStringLiteral( "1" ) : QStringLiteral( "0" ) );
   if ( symbol->flags() & Qgis::SymbolFlag::RendererShouldUseSymbolLevels )
     symEl.setAttribute( QStringLiteral( "renderer_should_use_levels" ), QStringLiteral( "1" ) );
diff --git a/src/gui/symbology/qgsextentbufferdialog.cpp b/src/gui/symbology/qgsextentbufferdialog.cpp
index 375ce66799bc..35f6f9c72ea6 100644
--- a/src/gui/symbology/qgsextentbufferdialog.cpp
+++ b/src/gui/symbology/qgsextentbufferdialog.cpp
@@ -21,6 +21,7 @@
 #include "qgspanelwidget.h"
 #include "qgssymbol.h"
 #include "qgssymbolwidgetcontext.h"
+#include "qgsunittypes.h"
 #include "qgsvectorlayer.h"
 
 QgsExtentBufferWidget::QgsExtentBufferWidget( QgsSymbol *symbol, QgsVectorLayer *layer, QWidget *parent )
@@ -28,13 +29,27 @@ QgsExtentBufferWidget::QgsExtentBufferWidget( QgsSymbol *symbol, QgsVectorLayer
 {
   setupUi( this );
 
-  mExtentBufferSpinBox->setValue( mSymbol-> extentBuffer() );
+  mExtentBufferSpinBox->setValue( mSymbol->extentBuffer() );
+
+  mExtentBufferUnitSelectionWidget->setShowMapScaleButton( false );
+  mExtentBufferUnitSelectionWidget->setUnits( { Qgis::RenderUnit::Millimeters,
+      Qgis::RenderUnit::MetersInMapUnits,
+      Qgis::RenderUnit::MapUnits,
+      Qgis::RenderUnit::Pixels,
+      Qgis::RenderUnit::Points,
+      Qgis::RenderUnit::Inches } );
+  mExtentBufferUnitSelectionWidget->setUnit( mSymbol->extentBufferSizeUnit() );
 
   connect( mExtentBufferSpinBox, static_cast < void ( QgsDoubleSpinBox::* )( double ) > ( &QgsDoubleSpinBox::valueChanged ), this, [ = ]()
   {
     emit widgetChanged();
   } );
 
+  connect( mExtentBufferUnitSelectionWidget, &QgsUnitSelectionWidget::changed, this, [ = ]()
+  {
+    emit widgetChanged();
+  } );
+
   registerDataDefinedButton( mExtentBufferDDButton, QgsSymbol::Property::ExtentBuffer );
 }
 
@@ -97,7 +112,7 @@ QgsExtentBufferDialog::QgsExtentBufferDialog( QgsSymbol *symbol, QgsVectorLayer
   vLayout->addWidget( bbox );
   setLayout( vLayout );
 
-  setWindowTitle( tr( "Extent buffer" ) );
+  setWindowTitle( tr( "Extent Buffer" ) );
 }
 
 double QgsExtentBufferDialog::extentBuffer() const
@@ -108,6 +123,19 @@ double QgsExtentBufferDialog::extentBuffer() const
   return mWidget->extentBuffer();
 }
 
+Qgis::RenderUnit QgsExtentBufferWidget::sizeUnit() const
+{
+  return mExtentBufferUnitSelectionWidget->unit();
+}
+
+Qgis::RenderUnit QgsExtentBufferDialog::sizeUnit() const
+{
+  if ( !mWidget )
+    return Qgis::RenderUnit::MapUnits;
+
+  return mWidget->sizeUnit();
+}
+
 QgsProperty QgsExtentBufferDialog::dataDefinedProperty() const
 {
   if ( !mWidget )
diff --git a/src/gui/symbology/qgsextentbufferdialog.h b/src/gui/symbology/qgsextentbufferdialog.h
index 698b107e5aa7..86c691bef11c 100644
--- a/src/gui/symbology/qgsextentbufferdialog.h
+++ b/src/gui/symbology/qgsextentbufferdialog.h
@@ -71,6 +71,12 @@ class GUI_EXPORT QgsExtentBufferWidget : public QgsPanelWidget, public QgsExpres
      */
     QgsSymbolWidgetContext context() const;
 
+    /**
+     * Returns the extent buffer unit currently set in the widget.
+     * \see setContext()
+     */
+    Qgis::RenderUnit sizeUnit() const;
+
   private:
     QgsSymbol *mSymbol = nullptr;
     QgsVectorLayer *mLayer = nullptr;
@@ -105,6 +111,11 @@ class GUI_EXPORT QgsExtentBufferDialog : public QDialog
      */
     double extentBuffer() const;
 
+    /**
+     * Returns the extent buffer unit currently set in the widget.
+     */
+    Qgis::RenderUnit sizeUnit() const;
+
     /**
      * Returns the extent buffer value currently set in the widget.
      *
diff --git a/src/gui/symbology/qgssymbolslistwidget.cpp b/src/gui/symbology/qgssymbolslistwidget.cpp
index c6913af68328..b9883ec17ddb 100644
--- a/src/gui/symbology/qgssymbolslistwidget.cpp
+++ b/src/gui/symbology/qgssymbolslistwidget.cpp
@@ -317,6 +317,7 @@ void QgsSymbolsListWidget::showExtentBufferSettings()
     {
       mSymbol->setExtentBuffer( widget->extentBuffer() );
       mSymbol->setDataDefinedProperty( QgsSymbol::Property::ExtentBuffer, widget->dataDefinedProperty() );
+      mSymbol->setExtentBufferSizeUnit( widget->sizeUnit() );
 
       emit changed();
     } );
@@ -337,6 +338,7 @@ void QgsSymbolsListWidget::showExtentBufferSettings()
     {
       mSymbol->setExtentBuffer( dlg.extentBuffer() );
       mSymbol->setDataDefinedProperty( QgsSymbol::Property::ExtentBuffer, dlg.dataDefinedProperty() );
+      mSymbol->setExtentBufferSizeUnit( dlg.sizeUnit() );
 
       emit changed();
     }
diff --git a/src/ui/qgsextentbufferdialogbase.ui b/src/ui/qgsextentbufferdialogbase.ui
index bdd16d9d4184..b3c8740f6ac6 100644
--- a/src/ui/qgsextentbufferdialogbase.ui
+++ b/src/ui/qgsextentbufferdialogbase.ui
@@ -17,7 +17,7 @@
    <item>
     <widget class="QLabel" name="label">
      <property name="text">
-      <string>Define an extent buffer distance in map units. The symbol will be rendered for features which are within the buffered map extent.</string>
+      <string>Define an extent buffer distance. The symbol will be rendered for features which are within the buffered map extent.</string>
      </property>
      <property name="wordWrap">
       <bool>true</bool>
@@ -36,7 +36,7 @@
      <item>
       <widget class="QgsDoubleSpinBox" name="mExtentBufferSpinBox">
        <property name="minimum">
-        <double>0</double>
+        <double>0.000000000000000</double>
        </property>
        <property name="maximum">
         <double>999999999.000000000000000</double>
@@ -49,6 +49,9 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QgsUnitSelectionWidget" name="mExtentBufferUnitSelectionWidget" native="true"/>
+     </item>
      <item>
       <widget class="QgsPropertyOverrideButton" name="mExtentBufferDDButton"/>
      </item>
@@ -86,6 +89,12 @@
    <header>qgspanelwidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>QgsUnitSelectionWidget</class>
+   <extends>QWidget</extends>
+   <header>qgsunitselectionwidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

From 1a2fdd00869ca9ce47916c866aa8f1f8d453bad6 Mon Sep 17 00:00:00 2001
From: Juho Ervasti <juho.ervasti@gispo.fi>
Date: Thu, 5 Dec 2024 19:34:42 +0200
Subject: [PATCH 12/15] Check extent buffer size unit in tests

---
 tests/src/python/test_qgssymbol.py           | 3 +++
 tests/src/python/test_qgssymbollayerutils.py | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/src/python/test_qgssymbol.py b/tests/src/python/test_qgssymbol.py
index 26b626a572af..218ec980f730 100644
--- a/tests/src/python/test_qgssymbol.py
+++ b/tests/src/python/test_qgssymbol.py
@@ -931,6 +931,9 @@ def test_extent_buffer(self):
         s.setExtentBuffer(-10)
         self.assertEqual(s.extentBuffer(), 0)
 
+        s.setExtentBufferSizeUnit(Qgis.RenderUnit.Pixels)
+        self.assertEqual(s.extentBufferSizeUnit(), Qgis.RenderUnit.Pixels)
+
     def renderCollection(self, geom, symbol):
         f = QgsFeature()
         f.setGeometry(geom)
diff --git a/tests/src/python/test_qgssymbollayerutils.py b/tests/src/python/test_qgssymbollayerutils.py
index bb55da07ab53..6d6ceb4d929c 100644
--- a/tests/src/python/test_qgssymbollayerutils.py
+++ b/tests/src/python/test_qgssymbollayerutils.py
@@ -1258,7 +1258,7 @@ def test_extent_buffer_load(self):
         doc = QDomDocument()
         elem = QDomElement()
 
-        extent_buffer_xml_string = """<symbol is_animated="0" name="0" type="fill" alpha="1" clip_to_extent="1" force_rhr="0" frame_rate="10" extent_buffer="1000">
+        extent_buffer_xml_string = """<symbol is_animated="0" name="0" type="fill" alpha="1" clip_to_extent="1" force_rhr="0" frame_rate="10" extent_buffer="1000" extent_buffer_unit="MM">
   <data_defined_properties>
   <Option type="Map">
    <Option value="" name="name" type="QString"/>
@@ -1300,6 +1300,7 @@ def test_extent_buffer_load(self):
         elem = doc.documentElement()
         symbol = QgsSymbolLayerUtils.loadSymbol(elem, QgsReadWriteContext())
         self.assertEqual(symbol.extentBuffer(), 1000)
+        self.assertEqual(symbol.extentBufferSizeUnit(), Qgis.RenderUnit.Millimeters)
 
         property = symbol.dataDefinedProperties().property(
             QgsSymbol.Property.ExtentBuffer

From 7089713eb9ed05cb956dbe68b8791016283d98c8 Mon Sep 17 00:00:00 2001
From: JuhoErvasti <juho.ervasti@gispo.fi>
Date: Mon, 9 Dec 2024 11:43:28 +0200
Subject: [PATCH 13/15] Address review

---
 .../auto_generated/symbology/qgssymbol.sip.in |  8 ++++-
 .../auto_generated/symbology/qgssymbol.sip.in |  8 ++++-
 src/core/symbology/qgsrenderer.cpp            |  6 +++-
 src/core/symbology/qgssymbol.cpp              |  2 +-
 src/core/symbology/qgssymbol.h                |  5 ++-
 src/core/vector/qgsvectorlayerrenderer.cpp    |  1 -
 src/gui/symbology/qgsextentbufferdialog.cpp   | 33 +++++++++++++++++--
 src/gui/symbology/qgsextentbufferdialog.h     |  6 ++++
 src/gui/symbology/qgssymbolslistwidget.cpp    |  2 +-
 9 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
index 0495714b5624..3feb0d3f746f 100644
--- a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
@@ -870,7 +870,7 @@ Internally, this notifies all symbol layers which were used via a call to
 %Docstring
 Returns the symbol's extent buffer.
 
-:return: The symbol's extent buffer
+Units are retrieved via :py:func:`~QgsSymbol.extentBufferSizeUnit`.
 
 .. versionadded:: 3.42
 %End
@@ -879,6 +879,8 @@ Returns the symbol's extent buffer.
 %Docstring
 Sets the symbol's extent buffer.
 
+Units are set via :py:func:`~QgsSymbol.setExtentBufferSizeUnit`.
+
 :param extentBuffer: buffer distance.
 
 .. seealso:: :py:func:`extentBuffer`
@@ -894,6 +896,8 @@ Sets the symbol's extent buffer.
 %Docstring
 Returns the units for the buffer size.
 
+.. seealso:: :py:func:`extentBuffer`
+
 .. seealso:: :py:func:`setExtentBufferSizeUnit`
 %End
 
@@ -901,6 +905,8 @@ Returns the units for the buffer size.
 %Docstring
 Sets the ``unit`` used for the extent buffer.
 
+.. seealso:: :py:func:`setExtentBuffer`
+
 .. seealso:: :py:func:`extentBufferSizeUnit`
 %End
 
diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in
index ca7a0ab5c81d..8be29e6b73f5 100644
--- a/python/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/core/auto_generated/symbology/qgssymbol.sip.in
@@ -870,7 +870,7 @@ Internally, this notifies all symbol layers which were used via a call to
 %Docstring
 Returns the symbol's extent buffer.
 
-:return: The symbol's extent buffer
+Units are retrieved via :py:func:`~QgsSymbol.extentBufferSizeUnit`.
 
 .. versionadded:: 3.42
 %End
@@ -879,6 +879,8 @@ Returns the symbol's extent buffer.
 %Docstring
 Sets the symbol's extent buffer.
 
+Units are set via :py:func:`~QgsSymbol.setExtentBufferSizeUnit`.
+
 :param extentBuffer: buffer distance.
 
 .. seealso:: :py:func:`extentBuffer`
@@ -894,6 +896,8 @@ Sets the symbol's extent buffer.
 %Docstring
 Returns the units for the buffer size.
 
+.. seealso:: :py:func:`extentBuffer`
+
 .. seealso:: :py:func:`setExtentBufferSizeUnit`
 %End
 
@@ -901,6 +905,8 @@ Returns the units for the buffer size.
 %Docstring
 Sets the ``unit`` used for the extent buffer.
 
+.. seealso:: :py:func:`setExtentBuffer`
+
 .. seealso:: :py:func:`extentBufferSizeUnit`
 %End
 
diff --git a/src/core/symbology/qgsrenderer.cpp b/src/core/symbology/qgsrenderer.cpp
index 361fcf15c82a..28ad5ef315cf 100644
--- a/src/core/symbology/qgsrenderer.cpp
+++ b/src/core/symbology/qgsrenderer.cpp
@@ -425,7 +425,7 @@ double QgsFeatureRenderer::maximumExtentBuffer( QgsRenderContext &context ) cons
   if ( symbolList.empty() )
     return 0;
 
-  const QgsExpressionContext &expContext = context.expressionContext();
+  QgsExpressionContext &expContext = context.expressionContext();
 
   auto getValueFromSymbol = [ &expContext, &context ]( const QgsSymbol * sym ) -> double
   {
@@ -435,7 +435,11 @@ double QgsFeatureRenderer::maximumExtentBuffer( QgsRenderContext &context ) cons
 
     if ( property.isActive() )
     {
+      expContext.setOriginalValueVariable( sym->extentBuffer() );
+
       value = sym->dataDefinedProperties().valueAsDouble( QgsSymbol::Property::ExtentBuffer, expContext, sym->extentBuffer() );
+      if ( value < 0 )
+        value = 0;
     }
     else
     {
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
index d6e3d15228c5..28e25055235f 100644
--- a/src/core/symbology/qgssymbol.cpp
+++ b/src/core/symbology/qgssymbol.cpp
@@ -2254,7 +2254,7 @@ void QgsSymbol::initPropertyDefinitions()
   sPropertyDefinitions = QgsPropertiesDefinition
   {
     { static_cast< int >( QgsSymbol::Property::Opacity ), QgsPropertyDefinition( "alpha", QObject::tr( "Opacity" ), QgsPropertyDefinition::Opacity, origin )},
-    { static_cast< int >( QgsSymbol::Property::ExtentBuffer ), QgsPropertyDefinition( "extent_buffer", QObject::tr( "Extent buffer" ), QgsPropertyDefinition::Double, origin )},
+    { static_cast< int >( QgsSymbol::Property::ExtentBuffer ), QgsPropertyDefinition( "extent_buffer", QObject::tr( "Extent buffer" ), QgsPropertyDefinition::DoublePositive, origin )},
   };
 }
 
diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
index ccadef984fbf..c2b98a38dfa0 100644
--- a/src/core/symbology/qgssymbol.h
+++ b/src/core/symbology/qgssymbol.h
@@ -871,7 +871,7 @@ class CORE_EXPORT QgsSymbol
     /**
      * Returns the symbol's extent buffer.
      *
-     * \returns The symbol's extent buffer
+     * Units are retrieved via extentBufferSizeUnit().
      * \since QGIS 3.42
      */
     double extentBuffer() const;
@@ -879,6 +879,7 @@ class CORE_EXPORT QgsSymbol
     /**
      * Sets the symbol's extent buffer.
      *
+     * Units are set via setExtentBufferSizeUnit().
      * \param extentBuffer buffer distance.
      * \see extentBuffer()
      * \note Negative values are not supported and will be changed to 0.
@@ -889,6 +890,7 @@ class CORE_EXPORT QgsSymbol
     /**
      * Returns the units for the buffer size.
      *
+     * \see extentBuffer()
      * \see setExtentBufferSizeUnit()
      */
     Qgis::RenderUnit extentBufferSizeUnit() const { return mExtentBufferSizeUnit; }
@@ -896,6 +898,7 @@ class CORE_EXPORT QgsSymbol
     /**
      * Sets the \a unit used for the extent buffer.
      *
+     * \see setExtentBuffer()
      * \see extentBufferSizeUnit()
      */
     void setExtentBufferSizeUnit( Qgis::RenderUnit unit ) { mExtentBufferSizeUnit = unit; }
diff --git a/src/core/vector/qgsvectorlayerrenderer.cpp b/src/core/vector/qgsvectorlayerrenderer.cpp
index 22ede9519769..2e682ead38b1 100644
--- a/src/core/vector/qgsvectorlayerrenderer.cpp
+++ b/src/core/vector/qgsvectorlayerrenderer.cpp
@@ -17,7 +17,6 @@
 
 #include "qgsmessagelog.h"
 #include "qgspallabeling.h"
-#include "qgsrectangle.h"
 #include "qgsrenderer.h"
 #include "qgsrendercontext.h"
 #include "qgssinglesymbolrenderer.h"
diff --git a/src/gui/symbology/qgsextentbufferdialog.cpp b/src/gui/symbology/qgsextentbufferdialog.cpp
index 35f6f9c72ea6..ca9b777e08cf 100644
--- a/src/gui/symbology/qgsextentbufferdialog.cpp
+++ b/src/gui/symbology/qgsextentbufferdialog.cpp
@@ -17,8 +17,11 @@
 #include "moc_qgsextentbufferdialog.cpp"
 #include "qdialogbuttonbox.h"
 #include "qgsexpressioncontext.h"
+#include "qgsexpressioncontextutils.h"
 #include "qgshelp.h"
+#include "qgsmapcanvas.h"
 #include "qgspanelwidget.h"
+#include "qgsproject.h"
 #include "qgssymbol.h"
 #include "qgssymbolwidgetcontext.h"
 #include "qgsunittypes.h"
@@ -78,8 +81,28 @@ void QgsExtentBufferWidget::registerDataDefinedButton( QgsPropertyOverrideButton
 
 QgsExpressionContext QgsExtentBufferWidget::createExpressionContext() const
 {
-  QList<QgsExpressionContextScope *> scopes = mContext.globalProjectAtlasMapLayerScopes( mLayer );
-  QgsExpressionContext expContext( scopes );
+  if ( QgsExpressionContext *lExpressionContext = mContext.expressionContext() )
+    return *lExpressionContext;
+
+  QgsExpressionContext expContext;
+
+  if ( mContext.mapCanvas() )
+  {
+    expContext = mContext.mapCanvas()->createExpressionContext();
+  }
+  else
+  {
+    expContext << QgsExpressionContextUtils::globalScope()
+               << QgsExpressionContextUtils::projectScope( QgsProject::instance() )
+               << QgsExpressionContextUtils::atlasScope( nullptr )
+               << QgsExpressionContextUtils::mapSettingsScope( QgsMapSettings() );
+  }
+
+  if ( mLayer )
+    expContext << QgsExpressionContextUtils::layerScope( mLayer );
+
+  expContext.setOriginalValueVariable( mExtentBufferSpinBox->value() );
+  expContext.setHighlightedVariables( QStringList() << QgsExpressionContext::EXPR_ORIGINAL_VALUE );
 
   return expContext;
 }
@@ -149,6 +172,12 @@ QgsExtentBufferWidget *QgsExtentBufferDialog::widget() const
   return mWidget;
 }
 
+void QgsExtentBufferDialog::setContext( const QgsSymbolWidgetContext &context )
+{
+  mWidget->setContext( context );
+}
+
+
 void QgsExtentBufferDialog::showHelp()
 {
   QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#extent-buffer" ) );
diff --git a/src/gui/symbology/qgsextentbufferdialog.h b/src/gui/symbology/qgsextentbufferdialog.h
index 86c691bef11c..bf2686748437 100644
--- a/src/gui/symbology/qgsextentbufferdialog.h
+++ b/src/gui/symbology/qgsextentbufferdialog.h
@@ -134,6 +134,12 @@ class GUI_EXPORT QgsExtentBufferDialog : public QDialog
     */
     QgsExtentBufferWidget *widget() const;
 
+    /**
+     * Sets the context in which widget is shown, e.g., the associated map canvas and expression contexts.
+     * \param context symbol widget context
+     */
+    void setContext( const QgsSymbolWidgetContext &context );
+
   private:
     QgsExtentBufferWidget *mWidget;
 
diff --git a/src/gui/symbology/qgssymbolslistwidget.cpp b/src/gui/symbology/qgssymbolslistwidget.cpp
index b9883ec17ddb..d8243687a555 100644
--- a/src/gui/symbology/qgssymbolslistwidget.cpp
+++ b/src/gui/symbology/qgssymbolslistwidget.cpp
@@ -331,7 +331,7 @@ void QgsSymbolsListWidget::showExtentBufferSettings()
 
     if ( dlg.widget() )
     {
-      dlg.widget()->setContext( mContext );
+      dlg.setContext( mContext );
     }
 
     if ( dlg.exec() == QDialog::Accepted )

From 7b31cee32cbac5badd6c7fa39a2ff4b58a8d9915 Mon Sep 17 00:00:00 2001
From: Juho Ervasti <juho.ervasti@gispo.fi>
Date: Mon, 9 Dec 2024 16:01:15 +0200
Subject: [PATCH 14/15] Fix format

---
 src/gui/symbology/qgsextentbufferdialog.cpp | 19 +++++--------------
 src/gui/symbology/qgsextentbufferdialog.h   |  3 ---
 src/gui/symbology/qgssymbolslistwidget.cpp  |  4 +---
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/gui/symbology/qgsextentbufferdialog.cpp b/src/gui/symbology/qgsextentbufferdialog.cpp
index ca9b777e08cf..63cec2614e3d 100644
--- a/src/gui/symbology/qgsextentbufferdialog.cpp
+++ b/src/gui/symbology/qgsextentbufferdialog.cpp
@@ -35,21 +35,14 @@ QgsExtentBufferWidget::QgsExtentBufferWidget( QgsSymbol *symbol, QgsVectorLayer
   mExtentBufferSpinBox->setValue( mSymbol->extentBuffer() );
 
   mExtentBufferUnitSelectionWidget->setShowMapScaleButton( false );
-  mExtentBufferUnitSelectionWidget->setUnits( { Qgis::RenderUnit::Millimeters,
-      Qgis::RenderUnit::MetersInMapUnits,
-      Qgis::RenderUnit::MapUnits,
-      Qgis::RenderUnit::Pixels,
-      Qgis::RenderUnit::Points,
-      Qgis::RenderUnit::Inches } );
+  mExtentBufferUnitSelectionWidget->setUnits( { Qgis::RenderUnit::Millimeters, Qgis::RenderUnit::MetersInMapUnits, Qgis::RenderUnit::MapUnits, Qgis::RenderUnit::Pixels, Qgis::RenderUnit::Points, Qgis::RenderUnit::Inches } );
   mExtentBufferUnitSelectionWidget->setUnit( mSymbol->extentBufferSizeUnit() );
 
-  connect( mExtentBufferSpinBox, static_cast < void ( QgsDoubleSpinBox::* )( double ) > ( &QgsDoubleSpinBox::valueChanged ), this, [ = ]()
-  {
+  connect( mExtentBufferSpinBox, static_cast<void ( QgsDoubleSpinBox::* )( double )>( &QgsDoubleSpinBox::valueChanged ), this, [=]() {
     emit widgetChanged();
   } );
 
-  connect( mExtentBufferUnitSelectionWidget, &QgsUnitSelectionWidget::changed, this, [ = ]()
-  {
+  connect( mExtentBufferUnitSelectionWidget, &QgsUnitSelectionWidget::changed, this, [=]() {
     emit widgetChanged();
   } );
 
@@ -70,9 +63,8 @@ void QgsExtentBufferWidget::registerDataDefinedButton( QgsPropertyOverrideButton
 {
   // pass in nullptr to avoid id, feature and geometry variables being added
   // since the buffer is not evaluated per-feature
-  button->init( static_cast< int >( key ), mSymbol->dataDefinedProperties(), QgsSymbol::propertyDefinitions(), nullptr );
-  connect( button, &QgsPropertyOverrideButton::changed, this, [ = ]()
-  {
+  button->init( static_cast<int>( key ), mSymbol->dataDefinedProperties(), QgsSymbol::propertyDefinitions(), nullptr );
+  connect( button, &QgsPropertyOverrideButton::changed, this, [=]() {
     emit widgetChanged();
   } );
 
@@ -182,4 +174,3 @@ void QgsExtentBufferDialog::showHelp()
 {
   QgsHelp::openHelp( QStringLiteral( "working_with_vector/vector_properties.html#extent-buffer" ) );
 }
-
diff --git a/src/gui/symbology/qgsextentbufferdialog.h b/src/gui/symbology/qgsextentbufferdialog.h
index bf2686748437..aab514c24359 100644
--- a/src/gui/symbology/qgsextentbufferdialog.h
+++ b/src/gui/symbology/qgsextentbufferdialog.h
@@ -38,7 +38,6 @@ class GUI_EXPORT QgsExtentBufferWidget : public QgsPanelWidget, public QgsExpres
 {
     Q_OBJECT
   public:
-
     /**
      * Constructor for QgsExtentBufferWidget
      */
@@ -102,7 +101,6 @@ class GUI_EXPORT QgsExtentBufferDialog : public QDialog
 {
     Q_OBJECT
   public:
-
     //! Constructor for QgsExtentBufferDialog.
     QgsExtentBufferDialog( QgsSymbol *symbol, QgsVectorLayer *layer, QWidget *parent SIP_TRANSFERTHIS = nullptr );
 
@@ -146,7 +144,6 @@ class GUI_EXPORT QgsExtentBufferDialog : public QDialog
   private slots:
 
     void showHelp();
-
 };
 
 #endif // QGSEXTENTBUFFERDIALOG_H
diff --git a/src/gui/symbology/qgssymbolslistwidget.cpp b/src/gui/symbology/qgssymbolslistwidget.cpp
index fdd89cdf1a62..14b2c7cc5af1 100644
--- a/src/gui/symbology/qgssymbolslistwidget.cpp
+++ b/src/gui/symbology/qgssymbolslistwidget.cpp
@@ -307,8 +307,7 @@ void QgsSymbolsListWidget::showExtentBufferSettings()
     widget->setPanelTitle( tr( "Extent Buffer" ) );
     widget->setContext( mContext );
 
-    connect( widget, &QgsPanelWidget::widgetChanged, this, [ = ]()
-    {
+    connect( widget, &QgsPanelWidget::widgetChanged, this, [=]() {
       mSymbol->setExtentBuffer( widget->extentBuffer() );
       mSymbol->setDataDefinedProperty( QgsSymbol::Property::ExtentBuffer, widget->dataDefinedProperty() );
       mSymbol->setExtentBufferSizeUnit( widget->sizeUnit() );
@@ -317,7 +316,6 @@ void QgsSymbolsListWidget::showExtentBufferSettings()
     } );
 
     panel->openPanel( widget );
-
   }
   else
   {

From f94a872e615040543bc8e68774109f53e77669a9 Mon Sep 17 00:00:00 2001
From: JuhoErvasti <juho.ervasti@gispo.fi>
Date: Mon, 9 Dec 2024 23:10:46 +0200
Subject: [PATCH 15/15] Add \since to new functions

---
 python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in | 4 ++++
 python/core/auto_generated/symbology/qgssymbol.sip.in       | 4 ++++
 src/core/symbology/qgssymbol.h                              | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
index c28d6e18b989..2aed119d80cc 100644
--- a/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/PyQt6/core/auto_generated/symbology/qgssymbol.sip.in
@@ -899,6 +899,8 @@ Returns the units for the buffer size.
 .. seealso:: :py:func:`extentBuffer`
 
 .. seealso:: :py:func:`setExtentBufferSizeUnit`
+
+.. versionadded:: 3.42
 %End
 
     void setExtentBufferSizeUnit( Qgis::RenderUnit unit );
@@ -908,6 +910,8 @@ Sets the ``unit`` used for the extent buffer.
 .. seealso:: :py:func:`setExtentBuffer`
 
 .. seealso:: :py:func:`extentBufferSizeUnit`
+
+.. versionadded:: 3.42
 %End
 
   protected:
diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in
index a9dc2d495561..4444d62c9b6e 100644
--- a/python/core/auto_generated/symbology/qgssymbol.sip.in
+++ b/python/core/auto_generated/symbology/qgssymbol.sip.in
@@ -899,6 +899,8 @@ Returns the units for the buffer size.
 .. seealso:: :py:func:`extentBuffer`
 
 .. seealso:: :py:func:`setExtentBufferSizeUnit`
+
+.. versionadded:: 3.42
 %End
 
     void setExtentBufferSizeUnit( Qgis::RenderUnit unit );
@@ -908,6 +910,8 @@ Sets the ``unit`` used for the extent buffer.
 .. seealso:: :py:func:`setExtentBuffer`
 
 .. seealso:: :py:func:`extentBufferSizeUnit`
+
+.. versionadded:: 3.42
 %End
 
   protected:
diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
index 1507d6129f24..dad7902b12ed 100644
--- a/src/core/symbology/qgssymbol.h
+++ b/src/core/symbology/qgssymbol.h
@@ -892,6 +892,7 @@ class CORE_EXPORT QgsSymbol
      *
      * \see extentBuffer()
      * \see setExtentBufferSizeUnit()
+     * \since QGIS 3.42
      */
     Qgis::RenderUnit extentBufferSizeUnit() const { return mExtentBufferSizeUnit; }
 
@@ -900,6 +901,7 @@ class CORE_EXPORT QgsSymbol
      *
      * \see setExtentBuffer()
      * \see extentBufferSizeUnit()
+     * \since QGIS 3.42
      */
     void setExtentBufferSizeUnit( Qgis::RenderUnit unit ) { mExtentBufferSizeUnit = unit; }