Merge pull request #46976 from alexbruy/dd-params-picture

Disable data-defined buttons for incompatible SVG pictures in Layout item (fix #26524)
qgis · Jan 25, 2022 · 322be66 · 322be66
2 parents 159a3e9 + 8e35fff
commit 322be66
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/gui/layout/qgslayoutpicturewidget.cpp b/src/gui/layout/qgslayoutpicturewidget.cpp
@@ -383,6 +383,7 @@ void QgsLayoutPictureWidget::updateSvgParamGui( bool resetValues )
     mFillColorButton->setColor( fill );
   }
   mFillColorButton->setEnabled( hasFillParam );
+  mFillColorDDBtn->setEnabled( hasFillParam );
   mFillColorButton->setAllowOpacity( hasFillOpacityParam );
   if ( resetValues )
   {
@@ -396,12 +397,14 @@ void QgsLayoutPictureWidget::updateSvgParamGui( bool resetValues )
     mStrokeColorButton->setColor( stroke );
   }
   mStrokeColorButton->setEnabled( hasStrokeParam );
+  mStrokeColorDDBtn->setEnabled( hasStrokeParam );
   mStrokeColorButton->setAllowOpacity( hasStrokeOpacityParam );
   if ( hasDefaultStrokeWidth && resetValues )
   {
     mStrokeWidthSpinBox->setValue( defaultStrokeWidth );
   }
   mStrokeWidthSpinBox->setEnabled( hasStrokeWidthParam );
+  mStrokeWidthDDBtn->setEnabled( hasStrokeWidthParam );
 }
 
 void QgsLayoutPictureWidget::mFillColorButton_colorChanged( const QColor &color )