Skip to content
Permalink
Browse files

[labelling] Fix masked symbol layers loss when

- opening layer properties window; or
- changing label settings in style dock
  • Loading branch information
nirvn committed Dec 17, 2019
1 parent fa20ebd commit 3404dff67e052ab0b8fd2a129fbbb406b8adf80c
@@ -159,6 +159,8 @@ Controls whether data defined alignment buttons are enabled.





protected slots:

void updateLinePlacementOptions();
@@ -843,6 +843,7 @@ void QgsTextFormatWidget::updateWidgetForFormat( const QgsTextFormat &format )
mBufferEffectWidget->setPaintEffect( mBufferEffect.get() );

// mask
mMaskedSymbolLayers = mask.maskedSymbolLayers();
mEnableMaskChkBx->setChecked( mask.enabled() );
mMaskBufferSizeSpinBox->setValue( mask.size() );
mMaskBufferUnitWidget->setUnit( mask.sizeUnit() );
@@ -1021,6 +1022,7 @@ QgsTextFormat QgsTextFormatWidget::format( bool includeDataDefinedProperties ) c
mask.setPaintEffect( mMaskEffect->clone() );
else
mask.setPaintEffect( nullptr );
mask.setMaskedSymbolLayers( mMaskedSymbolLayers );
format.setMask( mask );

// shape background
@@ -189,6 +189,9 @@ class GUI_EXPORT QgsTextFormatWidget : public QWidget, public QgsExpressionConte

//! Associated vector layer
QgsVectorLayer *mLayer = nullptr;

QgsSymbolLayerReferenceList mMaskedSymbolLayers;

protected slots:

//! Updates line placement options to reflect current state of widget

0 comments on commit 3404dff

Please sign in to comment.
You can’t perform that action at this time.