UX: Set fill/stroke view based on item

friction2d · Sep 1, 2024 · f2ee53d · f2ee53d
1 parent 42d7c5a
commit f2ee53d
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/app/GUI/fillstrokesettings.cpp b/src/app/GUI/fillstrokesettings.cpp
@@ -518,8 +518,14 @@ void FillStrokeSettingsWidget::setCurrentSettings(PaintSettingsAnimator *fillPai
 {
     setFillValuesFromFillSettings(fillPaintSettings);
     setStrokeValuesFromStrokeSettings(strokePaintSettings);
-    if (mTarget == PaintSetting::FILL) { setFillTarget(); }
-    else { setStrokeTarget(); }
+
+    const bool hasFill = fillPaintSettings ? fillPaintSettings->getPaintType() != PaintType::NOPAINT : false;
+    const bool hasStroke = strokePaintSettings ? strokePaintSettings->getPaintType() != PaintType::NOPAINT : false;
+    if (hasStroke && !hasFill) { setStrokeTarget(); }
+    else { setFillTarget(); }
+
+    //if (mTarget == PaintSetting::FILL) { setFillTarget(); }
+    //else { setStrokeTarget(); }
 }
 
 void FillStrokeSettingsWidget::clearAll()