From 419c09692862e15d0823dd5b430b14984b7027a6 Mon Sep 17 00:00:00 2001
From: waterv <help_5chan@outlook.com>
Date: Fri, 13 Oct 2023 11:55:29 +0800
Subject: [PATCH] fix: generated image range when canvas is extended

---
 src/canvas.ts | 57 ++++++++++++++++-----------------------------------
 1 file changed, 18 insertions(+), 39 deletions(-)

diff --git a/src/canvas.ts b/src/canvas.ts
index 53974950..dc25e1b3 100644
--- a/src/canvas.ts
+++ b/src/canvas.ts
@@ -166,50 +166,29 @@ export default class LogoCanvas {
       this.textMetricsR!.width +
       (textBaseLine * canvasHeight - this.textMetricsR!.fontBoundingBoxAscent) * horizontalTilt;
     //extend canvas
-    if (this.textWidthL + paddingX > canvasWidth / 2) {
-      this.canvasWidthL = this.textWidthL + paddingX;
-    } else {
-      this.canvasWidthL = canvasWidth / 2;
-    }
-    if (this.textWidthR + paddingX > canvasWidth / 2) {
-      this.canvasWidthR = this.textWidthR + paddingX;
-    } else {
-      this.canvasWidthR = canvasWidth / 2;
-    }
+    this.canvasWidthL = Math.max(this.textWidthL + paddingX, canvasWidth / 2);
+    this.canvasWidthR = Math.max(this.textWidthR + paddingX, canvasWidth / 2);
     this.canvas.width = this.canvasWidthL + this.canvasWidthR;
   }
   generateImg() {
     let outputCanvas: HTMLCanvasElement;
-    if (
-      this.textWidthL + paddingX < canvasWidth / 2 ||
-      this.textWidthR + paddingX < canvasWidth / 2
-    ) {
-      outputCanvas = document.createElement('canvas');
-      outputCanvas.width = this.textWidthL + this.textWidthR + paddingX * 2;
-      outputCanvas.height = this.canvas.height;
-      const ctx = outputCanvas.getContext('2d')!;
-      ctx.drawImage(
-        this.canvas,
-        canvasWidth / 2 - this.textWidthL - paddingX,
-        0,
-        this.textWidthL + this.textWidthR + paddingX * 2,
-        this.canvas.height,
-        0,
-        0,
-        this.textWidthL + this.textWidthR + paddingX * 2,
-        this.canvas.height
-      );
-    } else {
-      outputCanvas = this.canvas;
-    }
+    outputCanvas = document.createElement('canvas');
+    outputCanvas.width = this.textWidthL + this.textWidthR + paddingX * 2;
+    outputCanvas.height = this.canvas.height;
+    const ctx = outputCanvas.getContext('2d')!;
+    ctx.drawImage(
+      this.canvas,
+      this.canvasWidthL - this.textWidthL - paddingX,
+      0,
+      outputCanvas.width,
+      outputCanvas.height,
+      0,
+      0,
+      outputCanvas.width,
+      outputCanvas.height,
+    );
     return new Promise<Blob>((resolve, reject) => {
-      outputCanvas.toBlob((blob) => {
-        if (blob) {
-          resolve(blob);
-        } else {
-          reject();
-        }
-      });
+      outputCanvas.toBlob((blob) => blob ? resolve(blob) : reject());
     });
   }
   saveImg() {