Fixes #34946 : save masking pen join style

troopa81 · nyalldawson · commit 17006551e60e · 2020-05-08T03:07:16.000+10:00
diff --git a/src/gui/qgstextformatwidget.cpp b/src/gui/qgstextformatwidget.cpp
@@ -1037,7 +1037,7 @@ QgsTextFormat QgsTextFormatWidget::format( bool includeDataDefinedProperties ) c
   mask.setOpacity( mMaskOpacityWidget->opacity() );
   mask.setSizeUnit( mMaskBufferUnitWidget->unit() );
   mask.setSizeMapUnitScale( mMaskBufferUnitWidget->getMapUnitScale() );
-  mask.setJoinStyle( mBufferJoinStyleComboBox->penJoinStyle() );
+  mask.setJoinStyle( mMaskJoinStyleComboBox->penJoinStyle() );
   if ( mMaskEffect && !QgsPaintEffectRegistry::isDefaultStack( mMaskEffect.get() ) )
     mask.setPaintEffect( mMaskEffect->clone() );
   else
diff --git a/tests/src/python/test_qgstextformatwidget.py b/tests/src/python/test_qgstextformatwidget.py
@@ -69,7 +69,7 @@ def createMaskSettings(self):
         s.setSizeUnit(QgsUnitTypes.RenderPixels)
         s.setSizeMapUnitScale(QgsMapUnitScale(1, 2))
         s.setOpacity(0.5)
-        s.setJoinStyle(Qt.RoundJoin)
+        s.setJoinStyle(Qt.BevelJoin)
         s.setPaintEffect(QgsBlurEffect.create({'blur_level': '2.0', 'blur_unit': QgsUnitTypes.encodeUnit(QgsUnitTypes.RenderMillimeters), 'enabled': '1'}))
         s.setMaskedSymbolLayers([QgsSymbolLayerReference("layerid1", QgsSymbolLayerId("symbol", 1)),
                                  QgsSymbolLayerReference("layerid2", QgsSymbolLayerId("symbol2", 2))])
@@ -82,7 +82,7 @@ def checkMaskSettings(self, s):
         self.assertEqual(s.sizeUnit(), QgsUnitTypes.RenderPixels)
         self.assertEqual(s.sizeMapUnitScale(), QgsMapUnitScale(1, 2))
         self.assertEqual(s.opacity(), 0.5)
-        self.assertEqual(s.joinStyle(), Qt.RoundJoin)
+        self.assertEqual(s.joinStyle(), Qt.BevelJoin)
         self.assertTrue(s.paintEffect())
         self.assertEqual(s.paintEffect().blurLevel(), 2.0)
         self.assertEqual(s.maskedSymbolLayers(), [QgsSymbolLayerReference("layerid1", QgsSymbolLayerId("symbol", 1)),
