Fix bucket properties not being updated due to old reference

Author: MrStevns

app/src/bucketoptionswidget.cpp

@@ -48,11 +48,12 @@ BucketOptionsWidget::~BucketOptionsWidget()
 void BucketOptionsWidget::initUI()
 {
     mBucketTool = static_cast<BucketTool*>(mEditor->tools()->getTool(BUCKET));
-    mSettings = mBucketTool->settings();
 
-    auto toleranceInfo = mSettings.getInfo(BucketToolProperties::COLORTOLERANCE_VALUE);
-    auto expandInfo = mSettings.getInfo(BucketToolProperties::FILLEXPAND_VALUE);
-    auto thicknessInfo = mSettings.getInfo(BucketToolProperties::FILLTHICKNESS_VALUE);
+    BucketToolProperties properties = mBucketTool->settings();
+
+    auto toleranceInfo = properties.getInfo(BucketToolProperties::COLORTOLERANCE_VALUE);
+    auto expandInfo = properties.getInfo(BucketToolProperties::FILLEXPAND_VALUE);
+    auto thicknessInfo = properties.getInfo(BucketToolProperties::FILLTHICKNESS_VALUE);
 
     ui->colorToleranceSlider->init(tr("Color tolerance"), SpinSlider::GROWTH_TYPE::LINEAR, toleranceInfo.minInt(), toleranceInfo.maxInt());
     ui->expandSlider->init(tr("Expand fill"), SpinSlider::GROWTH_TYPE::LINEAR, expandInfo.minInt(), expandInfo.maxInt());
@@ -85,32 +86,34 @@ void BucketOptionsWidget::updateUI()
 {
     updatePropertyVisibility();
 
+    BucketToolProperties properties = mBucketTool->settings();
+
     if (mBucketTool->isPropertyEnabled(BucketToolProperties::FILLTHICKNESS_VALUE)) {
-        mBucketTool->setStrokeThickness(mSettings.fillThickness());
+        mBucketTool->setStrokeThickness(properties.fillThickness());
     }
 
     if (mBucketTool->isPropertyEnabled(BucketToolProperties::FILLEXPAND_ENABLED)) {
-        mBucketTool->setFillExpandEnabled(mSettings.fillExpandEnabled());
+        mBucketTool->setFillExpandEnabled(properties.fillExpandEnabled());
     }
 
     if (mBucketTool->isPropertyEnabled(BucketToolProperties::FILLEXPAND_VALUE)) {
-        mBucketTool->setFillExpand(mSettings.fillExpandAmount());
+        mBucketTool->setFillExpand(properties.fillExpandAmount());
     }
 
     if (mBucketTool->isPropertyEnabled(BucketToolProperties::FILLLAYERREFERENCEMODE_VALUE)) {
-        mBucketTool->setFillReferenceMode(mSettings.fillReferenceMode());
+        mBucketTool->setFillReferenceMode(properties.fillReferenceMode());
     }
 
     if (mBucketTool->isPropertyEnabled(BucketToolProperties::FILLMODE_VALUE)) {
-        mBucketTool->setFillMode(mSettings.fillMode());
+        mBucketTool->setFillMode(properties.fillMode());
     }
 
     if (mBucketTool->isPropertyEnabled(BucketToolProperties::COLORTOLERANCE_VALUE)) {
-        mBucketTool->setColorTolerance(mSettings.tolerance());
+        mBucketTool->setColorTolerance(properties.tolerance());
     }
 
     if (mBucketTool->isPropertyEnabled(BucketToolProperties::COLORTOLERANCE_ENABLED)) {
-        mBucketTool->setColorToleranceEnabled(mSettings.colorToleranceEnabled());
+        mBucketTool->setColorToleranceEnabled(properties.colorToleranceEnabled());
     }
 }
 

app/src/bucketoptionswidget.h

@@ -57,7 +57,6 @@ class BucketOptionsWidget : public BaseWidget
     void updatePropertyVisibility();
 
     BucketTool* mBucketTool = nullptr;
-    BucketToolProperties mSettings;
     Ui::BucketOptionsWidget *ui;
     Editor* mEditor = nullptr;
 };