Merge branch 'file-upload-image-crop' into 6.2-user-coverphoto

WoltLab · Dec 6, 2024 · dab00bf · dab00bf
2 parents 592b293 + a9d93bf
commit dab00bf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/ts/WoltLabSuite/Core/Component/Image/Cropper.ts b/ts/WoltLabSuite/Core/Component/Image/Cropper.ts
@@ -372,10 +372,13 @@ class MinMaxImageCropper extends ImageCropper {
 
   protected centerSelection(): void {
     this.cropperImage!.$center("contain");
+    this.#cropperCanvasRect = this.cropperImage!.getBoundingClientRect();
 
-    const { width: imageWidth } = this.cropperImage!.getBoundingClientRect();
-
-    this.cropperSelection!.$change(0, 0, imageWidth, 0, this.configuration.aspectRatio, true);
+    if (this.configuration.aspectRatio >= 1.0) {
+      this.cropperSelection!.$change(0, 0, this.#cropperCanvasRect.width, 0, this.configuration.aspectRatio, true);
+    } else {
+      this.cropperSelection!.$change(0, 0, 0, this.#cropperCanvasRect.height, this.configuration.aspectRatio, true);
+    }
     this.cropperSelection!.$center();
     this.cropperSelection!.scrollIntoView({ block: "center", inline: "center" });
   }

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Image/Cropper.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Image/Cropper.js