From 20a21c4650e278c6da1e281c0c56458fee103188 Mon Sep 17 00:00:00 2001
From: daylily <xy.r@outlook.com>
Date: Sat, 5 Apr 2025 02:19:40 -0400
Subject: [PATCH] Decouple imageIsCorrectRatio from ImageContext

---
 src/lib/contexts/image.svelte.ts                     | 6 +++---
 src/lib/layouts/edit/controls/ControlsSection.svelte | 2 +-
 src/lib/layouts/edit/preview/common.svelte.ts        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/contexts/image.svelte.ts b/src/lib/contexts/image.svelte.ts
index 7f3e570..77291c2 100644
--- a/src/lib/contexts/image.svelte.ts
+++ b/src/lib/contexts/image.svelte.ts
@@ -41,7 +41,7 @@ export function createImageContext(filesCtx: FilesContext): Readonly<ImageContex
   return setContext(ImageContextToken, ctx)
 }
 
-export function imageIsCorrectRatio(imageCtx: ImageContext): boolean {
-  if (imageCtx.image === null) return true
-  return imageCtx.image.height * DEVICE_WIDTH === imageCtx.image.width * DEVICE_HEIGHT
+export function imageIsCorrectRatio(image: ImageBitmap | null): boolean {
+  if (image === null) return true
+  return image.height * DEVICE_WIDTH === image.width * DEVICE_HEIGHT
 }
diff --git a/src/lib/layouts/edit/controls/ControlsSection.svelte b/src/lib/layouts/edit/controls/ControlsSection.svelte
index c555c4c..7524b14 100644
--- a/src/lib/layouts/edit/controls/ControlsSection.svelte
+++ b/src/lib/layouts/edit/controls/ControlsSection.svelte
@@ -20,7 +20,7 @@
   const config = getConversionConfig()
 
   const transformDisabled = $derived(imageCtx.image === null)
-  const imageNonSquare = $derived(!imageIsCorrectRatio(imageCtx))
+  const imageNonSquare = $derived(!imageIsCorrectRatio(imageCtx.image))
 
   function restoreDefaultImageSettings() {
     config.scaleMode = 'fit'
diff --git a/src/lib/layouts/edit/preview/common.svelte.ts b/src/lib/layouts/edit/preview/common.svelte.ts
index a83995b..855e535 100644
--- a/src/lib/layouts/edit/preview/common.svelte.ts
+++ b/src/lib/layouts/edit/preview/common.svelte.ts
@@ -16,7 +16,7 @@ export function makeAltText(filesCtx: FilesContext, imageCtx: ImageContext, conf
 
   const output = [`${DEVICE_WIDTH}-by-${DEVICE_HEIGHT}-pixels e-paper preview of "${file.name}"`]
 
-  if (!imageIsCorrectRatio(imageCtx)) {
+  if (!imageIsCorrectRatio(imageCtx.image)) {
     if (config.scaleMode === 'fit') output.push('letterboxed')
     else if (config.scaleMode === 'crop') output.push('cropped to fit')
     else if (config.scaleMode === 'distort') output.push('stretched to fit')