electricdusk/pics
1
0
Fork 0
forked from Public/pics
Code Issues Pull Requests Projects Releases Wiki Activity

Fix initial slicing dimensions in CropEditor.setDefaultCrop.

Browse Source 
Subtle bug. This has been in for years... :)
This commit is contained in:
Aaron van Geffen 2020-11-24 11:33:16 +01:00
parent 2a740d8cef
commit 93884e2e93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/js/crop_editor.js
View File

@ -94,7 +94,7 @@ class CropEditor {
// Cropping from the centre? // Cropping from the centre?
if (cropMethod === "c") { if (cropMethod === "c") {
// Crop vertically from the centre, using the entire width. // Crop vertically from the centre, using the entire width.
if (sourceAspectRatio < cropAspectRatio) { if (sourceAspectRatio <= cropAspectRatio) {
this.crop_width.value = source.naturalWidth; this.crop_width.value = source.naturalWidth;
this.crop_height.value = Math.ceil(source.naturalWidth / cropAspectRatio); this.crop_height.value = Math.ceil(source.naturalWidth / cropAspectRatio);
this.source_x.value = 0; this.source_x.value = 0;
@ -111,9 +111,9 @@ class CropEditor {
// Cropping a top or bottom slice? // Cropping a top or bottom slice?
else { else {
// Can we actually take a top or bottom slice from the original image? // Can we actually take a top or bottom slice from the original image?
if (sourceAspectRatio < cropAspectRatio) { if (sourceAspectRatio <= cropAspectRatio) {
this.crop_width.value = source.naturalWidth; this.crop_width.value = source.naturalWidth;
this.crop_height.value = Math.floor(source.naturalHeight / cropAspectRatio); this.crop_height.value = Math.floor(source.naturalWidth / cropAspectRatio);
this.source_x.value = "0"; this.source_x.value = "0";
this.source_y.value = cropMethod.indexOf("t") !== -1 ? "0" : source.naturalHeight - this.crop_height.value; this.source_y.value = cropMethod.indexOf("t") !== -1 ? "0" : source.naturalHeight - this.crop_height.value;
} }