[edit] fix export frame position and padWhiteSpace

spd789562 · Oct 15, 2024 · ce20f65 · ce20f65
1 parent 86e2dc6
commit ce20f65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/components/tab/ActionTab/ExportFrameButton.tsx b/src/components/tab/ActionTab/ExportFrameButton.tsx
@@ -40,7 +40,9 @@ export const ExportFrameButton = (props: ExportAnimateButtonProps) => {
     try {
       const files: [Blob, string][] = [];
       for await (const characterRef of props.characterRefs) {
-        const frameData = await characterRef.makeCharacterFrames(padWhiteSpace);
+        const frameData = await characterRef.makeCharacterFrames({
+          padWhiteSpace,
+        });
         files.push(
           ...(await getCharacterFrameBlobs(frameData, characterRef.character, {
             includeMoveJson: padWhiteSpace === false,

diff --git a/src/renderer/character/characterToCanvasFrames.ts b/src/renderer/character/characterToCanvasFrames.ts
@@ -210,14 +210,14 @@ async function makeFrames(
     y: -bound.top,
   };
   const exportFrames = unprocessedFrames.map((frame) => {
-    const top = basePos.y + frame.top;
-    const left = basePos.x + frame.left;
-
     const canvas = document.createElement('canvas');
     const ctx = canvas.getContext('2d') as CanvasRenderingContext2D;
     const needPad =
       options.padWhiteSpace || options.padWhiteSpace === undefined;
 
+    const top = needPad ? basePos.y + frame.top : -frame.top;
+    const left = needPad ? basePos.x + frame.left : -frame.left;
+
     if (needPad) {
       canvas.width = maxWidth;
       canvas.height = maxHeight;