From 9cb06e7d1a25080011439c8a29eb0e7dbaefcbf2 Mon Sep 17 00:00:00 2001
From: Jonathan Smith <jonathan@alpine-software.co.uk>
Date: Thu, 16 Sep 2021 07:30:10 +0100
Subject: [PATCH] Current canvas size now used when exporting

---
 js/_pixelEditorUtility.js |  4 ++--
 js/_pixelExport.js        | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/_pixelEditorUtility.js b/js/_pixelEditorUtility.js
index 73fa2b8..3ba4f7e 100644
--- a/js/_pixelEditorUtility.js
+++ b/js/_pixelEditorUtility.js
@@ -7,8 +7,8 @@
  */
 function mergeLayers(belowLayer, topLayer) {
 	// Copying the above content on the layerBelow
-    let belowImageData = belowLayer.getImageData(0, 0, canvas.width, canvas.height);
-    let toMergeImageData = topLayer.getImageData(0, 0, canvas.width, canvas.height);
+    let belowImageData = belowLayer.getImageData(0, 0, belowLayer.canvas.width, belowLayer.canvas.height);
+    let toMergeImageData = topLayer.getImageData(0, 0, topLayer.canvas.width, topLayer.canvas.height);
 
     for (let i=0; i<belowImageData.data.length; i+=4) {
         let currentMovePixel = [
diff --git a/js/_pixelExport.js b/js/_pixelExport.js
index 97560d5..3e8080d 100644
--- a/js/_pixelExport.js
+++ b/js/_pixelExport.js
@@ -6,9 +6,9 @@ function openPixelExportWindow() {
 
     if (selectedPalette != 'Choose a palette...'){
         var paletteAbbreviation = palettes[selectedPalette].name;
-        var fileName = 'pixel-'+paletteAbbreviation+'-'+canvasSize[0]+'x'+canvasSize[1]+'.png';
+        var fileName = 'pixel-'+paletteAbbreviation+'-'+layers[0].canvasSize[0]+'x'+layers[0].canvasSize[1]+'.png';
     } else {
-        var fileName = 'pixel-'+canvasSize[0]+'x'+canvasSize[1]+'.png';
+        var fileName = 'pixel-'+layers[0].canvasSize[0]+'x'+layers[0].canvasSize[1]+'.png';
         selectedPalette = 'none';
     }
 
@@ -33,11 +33,11 @@ function exportPixel() {
         var emptyCanvas = document.createElement("canvas");
         var layersCopy = layers.slice();
 
-        exportCanvas.width = canvasSize[0];
-        exportCanvas.height = canvasSize[1];
+        exportCanvas.width = layers[0].canvasSize[0];
+        exportCanvas.height = layers[0].canvasSize[1];
 
-        emptyCanvas.width = canvasSize[0];
-        emptyCanvas.height = canvasSize[1];
+        emptyCanvas.width = layers[0].canvasSize[0];
+        emptyCanvas.height = layers[0].canvasSize[1];
 
         // Sorting the layers by z index
         layersCopy.sort((a, b) => (a.canvas.style.zIndex > b.canvas.style.zIndex) ? 1 : -1);