skyler
/
Lightningbeam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix deleting objects

This commit is contained in:
Skyler Lehmkuhl 2025-01-14 23:36:54 -05:00
parent df3e2832bf
commit 14f14d03c8
2 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/main.js
View File

@ -2590,51 +2590,49 @@ class Layer extends Widget {
child[key] = frame.keys[child.idx][key]; child[key] = frame.keys[child.idx][key];
} }
} }
} if (!context.objectStack.includes(child)) {
} if (keyframe) {
} if (child.goToFrame != undefined) {
for (let child of this.children) { child.setFrameNum(child.goToFrame - 1)
if (!context.objectStack.includes(child)) { if (child.playFromFrame) {
if (keyframe) { child.playing = true
if (child.goToFrame != undefined) { } else {
child.setFrameNum(child.goToFrame - 1) child.playing = false
if (child.playFromFrame) { }
child.playing = true child.playing = true
} else { }
child.playing = false
} }
child.playing = true if (child.playing) {
} let lastFrame = 0;
} for (let i = this.frameNum; i >= 0; i--) {
if (child.playing) { if (
let lastFrame = 0; this.frames[i] &&
for (let i = this.frameNum; i >= 0; i--) { this.frames[i].keys[child.idx] &&
if ( this.frames[i].keys[child.idx].playFromFrame
this.frames[i] && ) {
this.frames[i].keys[child.idx] && lastFrame = i;
this.frames[i].keys[child.idx].playFromFrame break;
) { }
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) { if (this.activeShape) {
this.activeShape.draw(cxt) this.activeShape.draw(cxt)

2
src/tauri_polyfill.js
View File

@ -82,11 +82,9 @@ if (!window.__TAURI__) {
[filenameInput, fileFilter].forEach(el => Object.assign(el.style, { [filenameInput, fileFilter].forEach(el => Object.assign(el.style, {
width: '100%', padding: '10px', marginBottom: '10px' width: '100%', padding: '10px', marginBottom: '10px'
})); }));
[submitBtn, cancelBtn].forEach(el => el.style.padding = '10px 20px');
// Populate filter dropdown and set default filename // Populate filter dropdown and set default filename
filters.forEach(filter => fileFilter.add(new Option(filter.name, filter.extensions[0]))); filters.forEach(filter => fileFilter.add(new Option(filter.name, filter.extensions[0])));
// filenameInput.value = defaultFilename.split('.')[0];
filenameInput.value = defaultFilename filenameInput.value = defaultFilename
const extension = defaultFilename.split('.').pop(); const extension = defaultFilename.split('.').pop();
filenameInput.focus() filenameInput.focus()