From 70dc46fb48a9cb6a48974d1ccff8f9495225a9b7 Mon Sep 17 00:00:00 2001
From: Luca Damasco <luca.damasco@gmail.com>
Date: Wed, 15 Apr 2020 13:28:46 -0400
Subject: [PATCH] Remove unecessary window.devicePixelRatio adjustments that
 cause zooming errors.

---
 engine/dist/emptyproject.html                 | 10 +++++-----
 engine/dist/wickengine.js                     | 10 +++++-----
 engine/src/view/View.Project.js               |  8 ++++----
 public/corelibs/wick-engine/emptyproject.html | 10 +++++-----
 public/corelibs/wick-engine/wickengine.js     | 10 +++++-----
 5 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/engine/dist/emptyproject.html b/engine/dist/emptyproject.html
index cfd809b44..831da4dcb 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.4.10.16.11.19";
+var WICK_ENGINE_BUILD_VERSION = "2020.4.15.13.19.3";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -60598,7 +60598,7 @@
     } else if (this._fitMode === 'fill') {
       // Fill mode: Try to fit the wick project's canvas inside the container canvas by
       // scaling it as much as possible without changing the project's original aspect ratio
-      this.paper.view.zoom = this.model.zoom * this.calculateFitZoom() * window.devicePixelRatio;
+      this.paper.view.zoom = this.model.zoom * this.calculateFitZoom();
     }
 
     var pan = this._pan;
@@ -60706,7 +60706,7 @@
       strokeColor: 'black'
     }), // bottom
     new paper.Path.Rectangle({
-      from: new paper.Point(borderMin, this.model.height * window.devicePixelRatio + strokeOffset),
+      from: new paper.Point(borderMin, this.model.height + strokeOffset),
       to: new paper.Point(borderMax, borderMax),
       fillColor: 'black',
       strokeWidth: 1,
@@ -60714,13 +60714,13 @@
     }), // left
     new paper.Path.Rectangle({
       from: new paper.Point(borderMin, -strokeOffset),
-      to: new paper.Point(-strokeOffset, this.model.height * window.devicePixelRatio + strokeOffset),
+      to: new paper.Point(-strokeOffset, this.model.height + strokeOffset),
       fillColor: 'black',
       strokeWidth: 1,
       strokeColor: 'black'
     }), // right
     new paper.Path.Rectangle({
-      from: new paper.Point(this.model.width * window.devicePixelRatio + strokeOffset, -strokeOffset),
+      from: new paper.Point(this.model.width + strokeOffset, -strokeOffset),
       to: new paper.Point(borderMax, borderMax),
       fillColor: 'black',
       strokeWidth: 1,
diff --git a/engine/dist/wickengine.js b/engine/dist/wickengine.js
index 62cc71de5..9d87f151e 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.4.10.16.11.19";
+var WICK_ENGINE_BUILD_VERSION = "2020.4.15.13.19.3";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -60583,7 +60583,7 @@ Wick.View.Project = class extends Wick.View {
     } else if (this._fitMode === 'fill') {
       // Fill mode: Try to fit the wick project's canvas inside the container canvas by
       // scaling it as much as possible without changing the project's original aspect ratio
-      this.paper.view.zoom = this.model.zoom * this.calculateFitZoom() * window.devicePixelRatio;
+      this.paper.view.zoom = this.model.zoom * this.calculateFitZoom();
     }
 
     var pan = this._pan;
@@ -60691,7 +60691,7 @@ Wick.View.Project = class extends Wick.View {
       strokeColor: 'black'
     }), // bottom
     new paper.Path.Rectangle({
-      from: new paper.Point(borderMin, this.model.height * window.devicePixelRatio + strokeOffset),
+      from: new paper.Point(borderMin, this.model.height + strokeOffset),
       to: new paper.Point(borderMax, borderMax),
       fillColor: 'black',
       strokeWidth: 1,
@@ -60699,13 +60699,13 @@ Wick.View.Project = class extends Wick.View {
     }), // left
     new paper.Path.Rectangle({
       from: new paper.Point(borderMin, -strokeOffset),
-      to: new paper.Point(-strokeOffset, this.model.height * window.devicePixelRatio + strokeOffset),
+      to: new paper.Point(-strokeOffset, this.model.height + strokeOffset),
       fillColor: 'black',
       strokeWidth: 1,
       strokeColor: 'black'
     }), // right
     new paper.Path.Rectangle({
-      from: new paper.Point(this.model.width * window.devicePixelRatio + strokeOffset, -strokeOffset),
+      from: new paper.Point(this.model.width + strokeOffset, -strokeOffset),
       to: new paper.Point(borderMax, borderMax),
       fillColor: 'black',
       strokeWidth: 1,
diff --git a/engine/src/view/View.Project.js b/engine/src/view/View.Project.js
index fd7758a51..b3fe34f40 100644
--- a/engine/src/view/View.Project.js
+++ b/engine/src/view/View.Project.js
@@ -345,7 +345,7 @@ Wick.View.Project = class extends Wick.View {
         } else if (this._fitMode === 'fill') {
             // Fill mode: Try to fit the wick project's canvas inside the container canvas by
             // scaling it as much as possible without changing the project's original aspect ratio
-            this.paper.view.zoom = this.model.zoom * this.calculateFitZoom() * window.devicePixelRatio;
+            this.paper.view.zoom = this.model.zoom * this.calculateFitZoom();
         }
 
         var pan = this._pan;
@@ -465,7 +465,7 @@ Wick.View.Project = class extends Wick.View {
             }),
             // bottom
             new paper.Path.Rectangle({
-                from: new paper.Point(borderMin, (this.model.height*window.devicePixelRatio)+strokeOffset),
+                from: new paper.Point(borderMin, (this.model.height)+strokeOffset),
                 to: new paper.Point(borderMax, borderMax),
                 fillColor: 'black',
                 strokeWidth: 1,
@@ -474,14 +474,14 @@ Wick.View.Project = class extends Wick.View {
             // left
             new paper.Path.Rectangle({
                 from: new paper.Point(borderMin, -strokeOffset),
-                to: new paper.Point(-strokeOffset, (this.model.height*window.devicePixelRatio)+strokeOffset),
+                to: new paper.Point(-strokeOffset, (this.model.height)+strokeOffset),
                 fillColor: 'black',
                 strokeWidth: 1,
                 strokeColor: 'black',
             }),
             // right
             new paper.Path.Rectangle({
-                from: new paper.Point((this.model.width*window.devicePixelRatio)+strokeOffset, -strokeOffset),
+                from: new paper.Point((this.model.width)+strokeOffset, -strokeOffset),
                 to: new paper.Point(borderMax, borderMax),
                 fillColor: 'black',
                 strokeWidth: 1,
diff --git a/public/corelibs/wick-engine/emptyproject.html b/public/corelibs/wick-engine/emptyproject.html
index cfd809b44..831da4dcb 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.4.10.16.11.19";
+var WICK_ENGINE_BUILD_VERSION = "2020.4.15.13.19.3";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -60598,7 +60598,7 @@
     } else if (this._fitMode === 'fill') {
       // Fill mode: Try to fit the wick project's canvas inside the container canvas by
       // scaling it as much as possible without changing the project's original aspect ratio
-      this.paper.view.zoom = this.model.zoom * this.calculateFitZoom() * window.devicePixelRatio;
+      this.paper.view.zoom = this.model.zoom * this.calculateFitZoom();
     }
 
     var pan = this._pan;
@@ -60706,7 +60706,7 @@
       strokeColor: 'black'
     }), // bottom
     new paper.Path.Rectangle({
-      from: new paper.Point(borderMin, this.model.height * window.devicePixelRatio + strokeOffset),
+      from: new paper.Point(borderMin, this.model.height + strokeOffset),
       to: new paper.Point(borderMax, borderMax),
       fillColor: 'black',
       strokeWidth: 1,
@@ -60714,13 +60714,13 @@
     }), // left
     new paper.Path.Rectangle({
       from: new paper.Point(borderMin, -strokeOffset),
-      to: new paper.Point(-strokeOffset, this.model.height * window.devicePixelRatio + strokeOffset),
+      to: new paper.Point(-strokeOffset, this.model.height + strokeOffset),
       fillColor: 'black',
       strokeWidth: 1,
       strokeColor: 'black'
     }), // right
     new paper.Path.Rectangle({
-      from: new paper.Point(this.model.width * window.devicePixelRatio + strokeOffset, -strokeOffset),
+      from: new paper.Point(this.model.width + strokeOffset, -strokeOffset),
       to: new paper.Point(borderMax, borderMax),
       fillColor: 'black',
       strokeWidth: 1,
diff --git a/public/corelibs/wick-engine/wickengine.js b/public/corelibs/wick-engine/wickengine.js
index 62cc71de5..9d87f151e 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.4.10.16.11.19";
+var WICK_ENGINE_BUILD_VERSION = "2020.4.15.13.19.3";
 /*!
  * Paper.js v0.12.4 - The Swiss Army Knife of Vector Graphics Scripting.
  * http://paperjs.org/
@@ -60583,7 +60583,7 @@ Wick.View.Project = class extends Wick.View {
     } else if (this._fitMode === 'fill') {
       // Fill mode: Try to fit the wick project's canvas inside the container canvas by
       // scaling it as much as possible without changing the project's original aspect ratio
-      this.paper.view.zoom = this.model.zoom * this.calculateFitZoom() * window.devicePixelRatio;
+      this.paper.view.zoom = this.model.zoom * this.calculateFitZoom();
     }
 
     var pan = this._pan;
@@ -60691,7 +60691,7 @@ Wick.View.Project = class extends Wick.View {
       strokeColor: 'black'
     }), // bottom
     new paper.Path.Rectangle({
-      from: new paper.Point(borderMin, this.model.height * window.devicePixelRatio + strokeOffset),
+      from: new paper.Point(borderMin, this.model.height + strokeOffset),
       to: new paper.Point(borderMax, borderMax),
       fillColor: 'black',
       strokeWidth: 1,
@@ -60699,13 +60699,13 @@ Wick.View.Project = class extends Wick.View {
     }), // left
     new paper.Path.Rectangle({
       from: new paper.Point(borderMin, -strokeOffset),
-      to: new paper.Point(-strokeOffset, this.model.height * window.devicePixelRatio + strokeOffset),
+      to: new paper.Point(-strokeOffset, this.model.height + strokeOffset),
       fillColor: 'black',
       strokeWidth: 1,
       strokeColor: 'black'
     }), // right
     new paper.Path.Rectangle({
-      from: new paper.Point(this.model.width * window.devicePixelRatio + strokeOffset, -strokeOffset),
+      from: new paper.Point(this.model.width + strokeOffset, -strokeOffset),
       to: new paper.Point(borderMax, borderMax),
       fillColor: 'black',
       strokeWidth: 1,