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

Constrain aspect ratio conservation to image boundaries as well.

Browse Source
This commit is contained in:
Aaron van Geffen 2020-12-30 12:56:17 +01:00
parent 6ddf518294
commit 5c4a075231
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/js/crop_editor.js
View File

@ -292,10 +292,23 @@ class CropEditor {
let targetAspectRatio = current.crop_width / current.crop_height; let targetAspectRatio = current.crop_width / current.crop_height;
if (Math.abs(currentAspectRatio - targetAspectRatio) > 0.001) { if (Math.abs(currentAspectRatio - targetAspectRatio) > 0.001) {
// Landscape?
if (targetAspectRatio > 1.0) { if (targetAspectRatio > 1.0) {
this.crop_height.value = Math.ceil(this.crop_width.value / targetAspectRatio); let height = Math.ceil(this.crop_width.value / targetAspectRatio);
} else { if (parseInt(this.source_y.value) + height > this.original_image.naturalHeight) {
this.crop_width.value = Math.ceil(this.crop_height.value * targetAspectRatio); height = this.original_image.naturalHeight - this.source_y.value;
}
this.crop_width.value = height * targetAspectRatio;
this.crop_height.value = height;
}
// Portrait?
else {
let width = Math.ceil(this.crop_height.value * targetAspectRatio);
if (parseInt(this.source_x.value) + width > this.original_image.naturalWidth) {
width = this.original_image.naturalWidth - this.source_x.value;
}
this.crop_width.value = width;
this.crop_height.value = width / targetAspectRatio;
} }
} }
} }