From 4cbd1bb86e41282603da00294600ae471e2c1cbf Mon Sep 17 00:00:00 2001 From: leon Date: Wed, 10 Aug 2022 11:55:00 +0800 Subject: [PATCH] Roo/dialog/UploadCropbox.js --- Roo/dialog/UploadCropbox.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Roo/dialog/UploadCropbox.js b/Roo/dialog/UploadCropbox.js index 3b59fdee5a..693ec06c16 100644 --- a/Roo/dialog/UploadCropbox.js +++ b/Roo/dialog/UploadCropbox.js @@ -563,16 +563,13 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component, { if ((this.imageEl.OriginWidth / this.imageEl.OriginHeight >= this.minWidth / this.minHeight)) { maxPaddingTop = (this.canvasEl.width * this.minHeight / this.minWidth - this.canvasEl.height) / 2 + maxPaddingLeft; } - - var testX = Math.ceil(this.thumbEl.getLeft(true) + this.thumbEl.getWidth() - this.canvasEl.width - maxPaddingLeft); - var testY = Math.ceil(this.thumbEl.getTop(true) + this.thumbEl.getHeight() - this.canvas.height - maxPaddingTop); - - var minX = Math.ceil(this.thumbEl.getLeft(true)); - var minY = Math.ceil(this.thumbEl.getTop(true)); + var minX = Math.ceil(this.thumbEl.getLeft(true) + this.thumbEl.getWidth() - this.canvasEl.width - maxPaddingLeft); + var minY = Math.ceil(this.thumbEl.getTop(true) + this.thumbEl.getHeight() - this.canvas.height - maxPaddingTop); - var maxX = Math.ceil(minX + this.thumbEl.getWidth() - this.canvasEl.width); - var maxY = Math.ceil(minY + this.thumbEl.getHeight() - this.canvasEl.height); + var maxX = Math.ceil(this.thumbEl.getLeft(true) + maxPaddingLeft); + var maxY = Math.ceil(this.thumbEl.getTop(true) + maxPaddingTop); + if(minX > maxX) { var tempX = minX; -- 2.39.2