Merge branch 'pr/277'

Wicklets · Sep 29, 2020 · d5ed7cc · d5ed7cc
2 parents f9bf651 + 76472de
commit d5ed7cc
Show file tree

Hide file tree

Showing 8 changed files with 930 additions and 3,549 deletions.
diff --git a/engine/dist/emptyproject.html b/engine/dist/emptyproject.html
diff --git a/engine/dist/wickengine.js b/engine/dist/wickengine.js
diff --git a/engine/src/ToolSettings.js b/engine/src/ToolSettings.js
@@ -72,10 +72,10 @@ Wick.ToolSettings = class {
             default: true,
         }, {
             type: "number",
-            name: 'fillSmoothing',
-            default: 100,
+            name: 'gapFillAmount',
+            default: 1,
             min: 0,
-            max: 250,
+            max: 5,
             step: 1,
         }, {
         /**

diff --git a/engine/src/tools/FillBucket.js b/engine/src/tools/FillBucket.js
@@ -60,22 +60,24 @@ Wick.Tools.FillBucket = class extends Wick.Tool {
             this.paper.hole({
                 point: e.point,
                 bgColor: new paper.Color(this.project.backgroundColor.hex),
+                gapFillAmount: this.getSetting('gapFillAmount'),
                 layers: this.project.activeFrames.filter(frame => {
                     return !frame.parentLayer.hidden;
                 }).map(frame => {
                     return frame.view.objectsLayer;
                 }),
-                fillColor: this.getSetting('fillColor'),
                 onFinish: (path) => {
                     this.setCursor('default');
                     if (path) {
                         path.fillColor = this.getSetting('fillColor').rgba;
-                        path.strokeWidth = this.getSetting('fillSmoothing') / 100;
-                        path.strokeColor = this.getSetting('fillColor').rgba;
                         path.name = null;
                         this.addPathToProject();
-                        this.paper.project.activeLayer.addChild(path);
-                        this.paper.OrderingUtils.bringToFront([path]);
+                        if (e.item) {
+                            path.insertAbove(e.item);
+                        } else {
+                            this.paper.project.activeLayer.addChild(path);
+                            this.paper.OrderingUtils.sendToBack([path]);
+                        }
                         this.fireEvent('canvasModified');
                     }
                 },