From 5f09ceddcfd7efb5a8b42319472fb801d3c42f74 Mon Sep 17 00:00:00 2001
From: pxlvxl <toddj8581@yahoo.com>
Date: Sun, 27 Feb 2022 09:44:16 -0500
Subject: [PATCH] push7

---
 js/LayerList.js    | 32 +++++++++++++++++++++++---------
 js/Startup.js      |  5 ++---
 js/layers/Layer.js |  4 ++++
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/js/LayerList.js b/js/LayerList.js
index d69d878..7863c3b 100644
--- a/js/LayerList.js
+++ b/js/LayerList.js
@@ -211,21 +211,12 @@ const LayerList = (() => {
         }
     
         let layerIndex = currFile.layers.indexOf(currFile.currentLayer);
-        let toDuplicate = currFile.currentLayer;
-        let menuEntries = layerList.children;
     
-        // Increasing z-indexes of the layers above
-        const menuItemSize = getMenuEntryIndex(menuEntries, toDuplicate.menuEntry);
-
-        for (let i = 0; i < menuItemSize; i += 1) {
-            LayerList.getLayerByID(menuEntries[i].id).canvas.style.zIndex = 2 * (menuItemSize - i);
-        }
     
         // Creating a new canvas
         let newCanvas = document.createElement("canvas");
         // Setting up the new canvas
         currFile.canvasView.append(newCanvas);
-        newCanvas.style.zIndex = parseInt(currFile.currentLayer.canvas.style.zIndex) + 2;
         newCanvas.classList.add("drawingCanvas");
     
         if (!layerListEntry) return //console.warn('skipping adding layer because no document');
@@ -253,6 +244,9 @@ const LayerList = (() => {
         newLayer.context.putImageData(currFile.currentLayer.context.getImageData(
             0, 0, currFile.canvasSize[0], currFile.canvasSize[1]), 0, 0);
         newLayer.updateLayerPreview();
+
+        LayerList.refreshZ();
+
         // Basically "if I'm not adding a layer because redo() is telling meto do so", then I can save the history
         if (saveHistory) {
             new HistoryState().DuplicateLayer(newLayer, currFile.currentLayer);
@@ -414,7 +408,27 @@ const LayerList = (() => {
     function isRenamingLayer() {
         return renamingLayer;
     }
+    function refreshZ() {
+        try{
+            let selectedZIndex = 0;
+            let maxZ = 0;
+            currFile.layers.forEach((layer, i) => {
+                const _i = currFile.layers.length - i;
+                let z = (_i+1) * 10;
+                if(maxZ < z)maxZ = z;
+                layer.canvas.style.zIndex = z;
+                if(layer.isSelected){
+                    selectedZIndex = z;
+                }
+            });
+            currFile.checkerBoard.canvas.style.zIndex = 1;
+            currFile.pixelGrid.canvas.style.zIndex = 2;
+            currFile.TMPLayer.canvas.style.zIndex = selectedZIndex + 1;
+            currFile.VFXLayer.canvas.style.zIndex = maxZ + 10;
+        }catch(e){}
+    }
     return {
+        refreshZ,
         addLayer,
         mergeLayers,
         getLayerByID,
diff --git a/js/Startup.js b/js/Startup.js
index f7a7b82..5ea9426 100644
--- a/js/Startup.js
+++ b/js/Startup.js
@@ -83,7 +83,6 @@ const Startup = (() => {
         console.log('lpe === ',lpe);
         if( lpe.layers && lpe.layers.length ) {
             currFile.currentLayer = new Layer(width, height, `pixel-canvas`,"","layer-li-template");
-            currFile.currentLayer.canvas.style.zIndex = 2;
             currFile.sublayers.push(currFile.currentLayer);
 
             let selectedIdx = lpe.selectedLayer ?? 0;
@@ -95,7 +94,6 @@ const Startup = (() => {
                 if (layerData != null) {
                     // Setting id
                     let createdLayer = LayerList.addLayer(layerData.id, false, layerData.name);
-                    createdLayer.canvas.style.zIndex = (_i+1) * 10;
                     if(i===selectedIdx)createdLayer.selectLayer();
                     // Setting name
                     createdLayer.menuEntry.getElementsByTagName("p")[0].innerHTML = layerData.name;
@@ -121,7 +119,6 @@ const Startup = (() => {
 
         } else {
             currFile.currentLayer = new Layer(width, height, `pixel-canvas`,"");
-            currFile.currentLayer.canvas.style.zIndex = 2;
             currFile.sublayers.push(currFile.currentLayer);
             
             const defaultLayerId = "layer0";
@@ -148,6 +145,8 @@ const Startup = (() => {
         currFile.sublayers.push(currFile.TMPLayer);
         currFile.sublayers.push(currFile.pixelGrid);
         currFile.sublayers.push(currFile.VFXLayer);
+
+        LayerList.refreshZ();
     }
 
     function initPalette() {
diff --git a/js/layers/Layer.js b/js/layers/Layer.js
index ca7475c..195012c 100644
--- a/js/layers/Layer.js
+++ b/js/layers/Layer.js
@@ -246,6 +246,10 @@ class Layer {
         this.menuEntry.classList.add("selected-layer");
         currFile.currentLayer = this;
 
+        if(currFile.VFXLayer) { // only refresh z after init
+            LayerList.refreshZ();
+        }
+
         if(FileManager.cacheEnabled)FileManager.localStorageSave();
     }