mirror of
https://github.com/qgis/QGIS.git
synced 2025-12-07 00:03:52 -05:00
[labelling] Fix masked symbol layers loss when
- opening layer properties window; or - changing label settings in style dock
This commit is contained in:
parent
fa20ebd8d9
commit
3404dff67e
@ -159,6 +159,8 @@ Controls whether data defined alignment buttons are enabled.
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
|
|
||||||
void updateLinePlacementOptions();
|
void updateLinePlacementOptions();
|
||||||
|
|||||||
@ -843,6 +843,7 @@ void QgsTextFormatWidget::updateWidgetForFormat( const QgsTextFormat &format )
|
|||||||
mBufferEffectWidget->setPaintEffect( mBufferEffect.get() );
|
mBufferEffectWidget->setPaintEffect( mBufferEffect.get() );
|
||||||
|
|
||||||
// mask
|
// mask
|
||||||
|
mMaskedSymbolLayers = mask.maskedSymbolLayers();
|
||||||
mEnableMaskChkBx->setChecked( mask.enabled() );
|
mEnableMaskChkBx->setChecked( mask.enabled() );
|
||||||
mMaskBufferSizeSpinBox->setValue( mask.size() );
|
mMaskBufferSizeSpinBox->setValue( mask.size() );
|
||||||
mMaskBufferUnitWidget->setUnit( mask.sizeUnit() );
|
mMaskBufferUnitWidget->setUnit( mask.sizeUnit() );
|
||||||
@ -1021,6 +1022,7 @@ QgsTextFormat QgsTextFormatWidget::format( bool includeDataDefinedProperties ) c
|
|||||||
mask.setPaintEffect( mMaskEffect->clone() );
|
mask.setPaintEffect( mMaskEffect->clone() );
|
||||||
else
|
else
|
||||||
mask.setPaintEffect( nullptr );
|
mask.setPaintEffect( nullptr );
|
||||||
|
mask.setMaskedSymbolLayers( mMaskedSymbolLayers );
|
||||||
format.setMask( mask );
|
format.setMask( mask );
|
||||||
|
|
||||||
// shape background
|
// shape background
|
||||||
|
|||||||
@ -189,6 +189,9 @@ class GUI_EXPORT QgsTextFormatWidget : public QWidget, public QgsExpressionConte
|
|||||||
|
|
||||||
//! Associated vector layer
|
//! Associated vector layer
|
||||||
QgsVectorLayer *mLayer = nullptr;
|
QgsVectorLayer *mLayer = nullptr;
|
||||||
|
|
||||||
|
QgsSymbolLayerReferenceList mMaskedSymbolLayers;
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
|
|
||||||
//! Updates line placement options to reflect current state of widget
|
//! Updates line placement options to reflect current state of widget
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user