From 14f14d03c89c4f322de68fab79d95062da2495bd Mon Sep 17 00:00:00 2001
From: Skyler Lehmkuhl <skycooler@gmail.com>
Date: Tue, 14 Jan 2025 23:36:54 -0500
Subject: [PATCH] fix deleting objects

---
 src/main.js           | 78 +++++++++++++++++++++----------------------
 src/tauri_polyfill.js |  2 --
 2 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/src/main.js b/src/main.js
index b57fad8..e641ffa 100644
--- a/src/main.js
+++ b/src/main.js
@@ -2590,51 +2590,49 @@ class Layer extends Widget {
               child[key] = frame.keys[child.idx][key];
             }
           }
-        }
-      }
-    }
-    for (let child of this.children) {
-      if (!context.objectStack.includes(child)) {
-        if (keyframe) {
-          if (child.goToFrame != undefined) {
-            child.setFrameNum(child.goToFrame - 1)
-            if (child.playFromFrame) {
-              child.playing = true
-            } else {
-              child.playing = false
+          if (!context.objectStack.includes(child)) {
+            if (keyframe) {
+              if (child.goToFrame != undefined) {
+                child.setFrameNum(child.goToFrame - 1)
+                if (child.playFromFrame) {
+                  child.playing = true
+                } else {
+                  child.playing = false
+                }
+                child.playing = true
+              }
             }
-            child.playing = true
-          }
-        }
-        if (child.playing) {
-          let lastFrame = 0;
-          for (let i = this.frameNum; i >= 0; i--) {
-            if (
-              this.frames[i] &&
-              this.frames[i].keys[child.idx] &&
-              this.frames[i].keys[child.idx].playFromFrame
-            ) {
-              lastFrame = i;
-              break;
+            if (child.playing) {
+              let lastFrame = 0;
+              for (let i = this.frameNum; i >= 0; i--) {
+                if (
+                  this.frames[i] &&
+                  this.frames[i].keys[child.idx] &&
+                  this.frames[i].keys[child.idx].playFromFrame
+                ) {
+                  lastFrame = i;
+                  break;
+                }
+              }
+              child.setFrameNum(this.frameNum - lastFrame);
             }
           }
-          child.setFrameNum(this.frameNum - lastFrame);
+          const transform = ctx.getTransform()
+          ctx.translate(child.x, child.y)
+          ctx.scale(child.scale_x, child.scale_y)
+          ctx.rotate(child.rotation)
+          child.draw(ctx)
+          if (context.selection.includes(child)) {
+            ctx.lineWidth = 1;
+            ctx.strokeStyle = "#00ffff";
+            ctx.beginPath();
+            let bbox = child.bbox()
+            ctx.rect(bbox.x.min-child.x, bbox.y.min-child.y, bbox.x.max-bbox.x.min, bbox.y.max-bbox.y.min)
+            ctx.stroke()
+          }
+          ctx.setTransform(transform)
         }
       }
-      const transform = ctx.getTransform()
-      ctx.translate(child.x, child.y)
-      ctx.scale(child.scale_x, child.scale_y)
-      ctx.rotate(child.rotation)
-      child.draw(ctx)
-      if (context.selection.includes(child)) {
-        ctx.lineWidth = 1;
-        ctx.strokeStyle = "#00ffff";
-        ctx.beginPath();
-        let bbox = child.bbox()
-        ctx.rect(bbox.x.min-child.x, bbox.y.min-child.y, bbox.x.max-bbox.x.min, bbox.y.max-bbox.y.min)
-        ctx.stroke()
-      }
-      ctx.setTransform(transform)
     }
     if (this.activeShape) {
       this.activeShape.draw(cxt)
diff --git a/src/tauri_polyfill.js b/src/tauri_polyfill.js
index 1c0e045..1148a38 100644
--- a/src/tauri_polyfill.js
+++ b/src/tauri_polyfill.js
@@ -82,11 +82,9 @@ if (!window.__TAURI__) {
       [filenameInput, fileFilter].forEach(el => Object.assign(el.style, {
         width: '100%', padding: '10px', marginBottom: '10px'
       }));
-      [submitBtn, cancelBtn].forEach(el => el.style.padding = '10px 20px');
       
       // Populate filter dropdown and set default filename
       filters.forEach(filter => fileFilter.add(new Option(filter.name, filter.extensions[0])));
-      // filenameInput.value = defaultFilename.split('.')[0];
       filenameInput.value = defaultFilename
       const extension = defaultFilename.split('.').pop();
       filenameInput.focus()