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

Fix "frame deleting" issue

This commit is contained in:
Skyler Lehmkuhl 2025-01-23 16:25:51 -05:00
parent e13c92f661
commit 1bfacd6b11
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.js
View File

@ -1297,6 +1297,7 @@ let actions = {
const selectedFrames = structuredClone(context.selectedFrames); const selectedFrames = structuredClone(context.selectedFrames);
for (let frame of selectedFrames) { for (let frame of selectedFrames) {
frame.replacementUuid = uuidv4(); frame.replacementUuid = uuidv4();
frame.layer = context.activeObject.layers.length - frame.layer - 1;
} }
// const fillFrames = [] // const fillFrames = []
// for (let i=0; i<context.activeObject.layers.length;i++) { // for (let i=0; i<context.activeObject.layers.length;i++) {
@ -1332,7 +1333,8 @@ let actions = {
} }
} }
for (let frameObj of frameBuffer) { for (let frameObj of frameBuffer) {
const layer_idx = frameObj.layer + action.offset.layers; // TODO: figure out object tracking when moving frames between layers
const layer_idx = frameObj.layer// + action.offset.layers;
let layer = object.layers[layer_idx]; let layer = object.layers[layer_idx];
let frame = frameObj.frame; let frame = frameObj.frame;
layer.addFrame(frameObj.frameNum + action.offset.frames, frame, []); //fillFrames[layer_idx]) layer.addFrame(frameObj.frameNum + action.offset.frames, frame, []); //fillFrames[layer_idx])
@ -6550,7 +6552,7 @@ function timeline() {
updateLayers(); updateLayers();
}); });
timeline_cvs.addEventListener("pointerup", (e) => { timeline_cvs.addEventListener("pointerup", (e) => {
let mouse = getMousePos(timeline_cvs, e); let mouse = getMousePos(timeline_cvs, e, true, true);
mouse.y += timeline_cvs.offsetY; mouse.y += timeline_cvs.offsetY;
if (mouse.x > layerWidth || timeline_cvs.draggingFrames) { if (mouse.x > layerWidth || timeline_cvs.draggingFrames) {
mouse.x += timeline_cvs.offsetX - layerWidth; mouse.x += timeline_cvs.offsetX - layerWidth;
@ -6570,7 +6572,7 @@ function timeline() {
} }
}); });
timeline_cvs.addEventListener("pointermove", (e) => { timeline_cvs.addEventListener("pointermove", (e) => {
let mouse = getMousePos(timeline_cvs, e); let mouse = getMousePos(timeline_cvs, e, true, true);
mouse.y += timeline_cvs.offsetY; mouse.y += timeline_cvs.offsetY;
if (mouse.x > layerWidth || timeline_cvs.draggingFrames) { if (mouse.x > layerWidth || timeline_cvs.draggingFrames) {
mouse.x += timeline_cvs.offsetX - layerWidth; mouse.x += timeline_cvs.offsetX - layerWidth;