From f9bf6518859c24711a101dd88c61f60cc70935fd Mon Sep 17 00:00:00 2001
From: Luca Damasco <luca.damasco@gmail.com>
Date: Tue, 29 Sep 2020 19:28:36 -0400
Subject: [PATCH] Fix bug where buttons were not created properly from
 selections.

---
 engine/dist/emptyproject.html                 | 34 +++++++++++++------
 engine/dist/wickengine.js                     | 34 +++++++++++++------
 engine/src/base/Project.js                    | 29 +++++++++++-----
 public/corelibs/wick-engine/emptyproject.html | 34 +++++++++++++------
 public/corelibs/wick-engine/wickengine.js     | 34 +++++++++++++------
 5 files changed, 117 insertions(+), 48 deletions(-)

diff --git a/engine/dist/emptyproject.html b/engine/dist/emptyproject.html
index db1069542..1e3f90bd1 100644
--- a/engine/dist/emptyproject.html
+++ b/engine/dist/emptyproject.html
@@ -14,7 +14,7 @@
         <!-- The Wick Engine build is injected here during the engine build step (see gulpfile.js) -->
         <script>
             /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.9.28.15.26.35";
+var WICK_ENGINE_BUILD_VERSION = "2020.9.29.19.26.19";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -50553,16 +50553,30 @@
       return;
     }
 
-    var clip = new Wick[args.type]({
-      identifier: args.identifier,
-      transformation: new Wick.Transformation({
-        x: this.selection.x + this.selection.width / 2,
-        y: this.selection.y + this.selection.height / 2
-      })
-    }); // Add the clip to the frame prior to adding objects.
+    let clip;
+
+    if (args.type === 'Button') {
+      clip = new Wick[args.type]({
+        identifier: args.identifier,
+        transformation: new Wick.Transformation({
+          x: this.selection.x + this.selection.width / 2,
+          y: this.selection.y + this.selection.height / 2
+        }),
+        objects: this.selection.getSelectedObjects('Canvas')
+      });
+    } else {
+      clip = new Wick[args.type]({
+        identifier: args.identifier,
+        transformation: new Wick.Transformation({
+          x: this.selection.x + this.selection.width / 2,
+          y: this.selection.y + this.selection.height / 2
+        })
+      });
+      clip.addObjects(this.selection.getSelectedObjects('Canvas'));
+    } // Add the clip to the frame prior to adding objects.
+
 
-    this.activeFrame.addClip(clip);
-    clip.addObjects(this.selection.getSelectedObjects('Canvas')); // TODO add to asset library
+    this.activeFrame.addClip(clip); // TODO add to asset library
 
     this.selection.clear();
     this.selection.select(clip);
diff --git a/engine/dist/wickengine.js b/engine/dist/wickengine.js
index 310d368ab..f7ce1674e 100644
--- a/engine/dist/wickengine.js
+++ b/engine/dist/wickengine.js
@@ -1,5 +1,5 @@
 /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.9.28.15.26.35";
+var WICK_ENGINE_BUILD_VERSION = "2020.9.29.19.26.19";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -50538,16 +50538,30 @@ Wick.Project = class extends Wick.Base {
       return;
     }
 
-    var clip = new Wick[args.type]({
-      identifier: args.identifier,
-      transformation: new Wick.Transformation({
-        x: this.selection.x + this.selection.width / 2,
-        y: this.selection.y + this.selection.height / 2
-      })
-    }); // Add the clip to the frame prior to adding objects.
+    let clip;
+
+    if (args.type === 'Button') {
+      clip = new Wick[args.type]({
+        identifier: args.identifier,
+        transformation: new Wick.Transformation({
+          x: this.selection.x + this.selection.width / 2,
+          y: this.selection.y + this.selection.height / 2
+        }),
+        objects: this.selection.getSelectedObjects('Canvas')
+      });
+    } else {
+      clip = new Wick[args.type]({
+        identifier: args.identifier,
+        transformation: new Wick.Transformation({
+          x: this.selection.x + this.selection.width / 2,
+          y: this.selection.y + this.selection.height / 2
+        })
+      });
+      clip.addObjects(this.selection.getSelectedObjects('Canvas'));
+    } // Add the clip to the frame prior to adding objects.
+
 
-    this.activeFrame.addClip(clip);
-    clip.addObjects(this.selection.getSelectedObjects('Canvas')); // TODO add to asset library
+    this.activeFrame.addClip(clip); // TODO add to asset library
 
     this.selection.clear();
     this.selection.select(clip);
diff --git a/engine/src/base/Project.js b/engine/src/base/Project.js
index 7379eb6d8..3a9d4f05a 100644
--- a/engine/src/base/Project.js
+++ b/engine/src/base/Project.js
@@ -1103,17 +1103,30 @@ Wick.Project = class extends Wick.Base {
             return;
         }
 
-        var clip = new Wick[args.type]({
-            identifier: args.identifier,
-            transformation: new Wick.Transformation({
-                x: this.selection.x + this.selection.width / 2,
-                y: this.selection.y + this.selection.height / 2,
-            }),
-        });
+        let clip;
+
+        if (args.type === 'Button') {
+            clip = new Wick[args.type]({
+                identifier: args.identifier,
+                transformation: new Wick.Transformation({
+                    x: this.selection.x + this.selection.width / 2,
+                    y: this.selection.y + this.selection.height / 2,
+                }),
+                objects: this.selection.getSelectedObjects('Canvas')
+            });
+        } else {
+            clip = new Wick[args.type]({
+                identifier: args.identifier,
+                transformation: new Wick.Transformation({
+                    x: this.selection.x + this.selection.width / 2,
+                    y: this.selection.y + this.selection.height / 2,
+                })
+            });
+            clip.addObjects(this.selection.getSelectedObjects('Canvas'));
+        }
 
         // Add the clip to the frame prior to adding objects.
         this.activeFrame.addClip(clip);
-        clip.addObjects(this.selection.getSelectedObjects('Canvas'));
 
         // TODO add to asset library
         this.selection.clear();
diff --git a/public/corelibs/wick-engine/emptyproject.html b/public/corelibs/wick-engine/emptyproject.html
index db1069542..1e3f90bd1 100644
--- a/public/corelibs/wick-engine/emptyproject.html
+++ b/public/corelibs/wick-engine/emptyproject.html
@@ -14,7 +14,7 @@
         <!-- The Wick Engine build is injected here during the engine build step (see gulpfile.js) -->
         <script>
             /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.9.28.15.26.35";
+var WICK_ENGINE_BUILD_VERSION = "2020.9.29.19.26.19";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -50553,16 +50553,30 @@
       return;
     }
 
-    var clip = new Wick[args.type]({
-      identifier: args.identifier,
-      transformation: new Wick.Transformation({
-        x: this.selection.x + this.selection.width / 2,
-        y: this.selection.y + this.selection.height / 2
-      })
-    }); // Add the clip to the frame prior to adding objects.
+    let clip;
+
+    if (args.type === 'Button') {
+      clip = new Wick[args.type]({
+        identifier: args.identifier,
+        transformation: new Wick.Transformation({
+          x: this.selection.x + this.selection.width / 2,
+          y: this.selection.y + this.selection.height / 2
+        }),
+        objects: this.selection.getSelectedObjects('Canvas')
+      });
+    } else {
+      clip = new Wick[args.type]({
+        identifier: args.identifier,
+        transformation: new Wick.Transformation({
+          x: this.selection.x + this.selection.width / 2,
+          y: this.selection.y + this.selection.height / 2
+        })
+      });
+      clip.addObjects(this.selection.getSelectedObjects('Canvas'));
+    } // Add the clip to the frame prior to adding objects.
+
 
-    this.activeFrame.addClip(clip);
-    clip.addObjects(this.selection.getSelectedObjects('Canvas')); // TODO add to asset library
+    this.activeFrame.addClip(clip); // TODO add to asset library
 
     this.selection.clear();
     this.selection.select(clip);
diff --git a/public/corelibs/wick-engine/wickengine.js b/public/corelibs/wick-engine/wickengine.js
index 310d368ab..f7ce1674e 100644
--- a/public/corelibs/wick-engine/wickengine.js
+++ b/public/corelibs/wick-engine/wickengine.js
@@ -1,5 +1,5 @@
 /*Wick Engine https://github.com/Wicklets/wick-engine*/
-var WICK_ENGINE_BUILD_VERSION = "2020.9.28.15.26.35";
+var WICK_ENGINE_BUILD_VERSION = "2020.9.29.19.26.19";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -50538,16 +50538,30 @@ Wick.Project = class extends Wick.Base {
       return;
     }
 
-    var clip = new Wick[args.type]({
-      identifier: args.identifier,
-      transformation: new Wick.Transformation({
-        x: this.selection.x + this.selection.width / 2,
-        y: this.selection.y + this.selection.height / 2
-      })
-    }); // Add the clip to the frame prior to adding objects.
+    let clip;
+
+    if (args.type === 'Button') {
+      clip = new Wick[args.type]({
+        identifier: args.identifier,
+        transformation: new Wick.Transformation({
+          x: this.selection.x + this.selection.width / 2,
+          y: this.selection.y + this.selection.height / 2
+        }),
+        objects: this.selection.getSelectedObjects('Canvas')
+      });
+    } else {
+      clip = new Wick[args.type]({
+        identifier: args.identifier,
+        transformation: new Wick.Transformation({
+          x: this.selection.x + this.selection.width / 2,
+          y: this.selection.y + this.selection.height / 2
+        })
+      });
+      clip.addObjects(this.selection.getSelectedObjects('Canvas'));
+    } // Add the clip to the frame prior to adding objects.
+
 
-    this.activeFrame.addClip(clip);
-    clip.addObjects(this.selection.getSelectedObjects('Canvas')); // TODO add to asset library
+    this.activeFrame.addClip(clip); // TODO add to asset library
 
     this.selection.clear();
     this.selection.select(clip);