From: leon <leon@roojs.com>
Date: Wed, 6 Jul 2022 03:23:55 +0000 (+0800)
Subject: Roo/dialog/UploadCropbox.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=fb637473f64574ee742ad585414b531a7f529368

Roo/dialog/UploadCropbox.js
roojs-core.js
roojs-core-debug.js
roojs-ui.js
roojs-ui-debug.js
roojs-all.js
roojs-debug.js
---

diff --git a/Roo/dialog/UploadCropbox.js b/Roo/dialog/UploadCropbox.js
index 9b0ead0093..f22d1b1ab7 100644
--- a/Roo/dialog/UploadCropbox.js
+++ b/Roo/dialog/UploadCropbox.js
@@ -764,7 +764,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         contextEl.scale(this.getScaleLevel(), this.getScaleLevel());
         
-        contextEl.translate(center, center);
+        contextEl.translate(1, 1);
         contextEl.rotate(this.rotate * Math.PI / 180);
 
         contextEl.drawImage(this.imageEl, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight);
diff --git a/roojs-all.js b/roojs-all.js
index 67a06155ab..5f4dc0e792 100644
--- a/roojs-all.js
+++ b/roojs-all.js
@@ -2916,7 +2916,7 @@ var bh=Math.ceil(this.canvasEl.height/this.getScaleLevel());this.startScale=this
 }this.rotate=(this.rotate>180)?0:this.rotate+90;this.draw();return;}this.scale=this.startScale;this.onRotateFail();return false;}this.rotate=(this.rotate>180)?0:this.rotate+90;if(this.isDocument){this.setThumbBoxSize();this.setThumbBoxPosition();this.setCanvasPosition();
 }this.draw();this.fireEvent('rotate',this,'right');},onRotateFail:function(){this.errorEl.show(true);var A=this;(function(){A.errorEl.hide(true);}).defer(this.errorTimeout);},draw:function(){console.log("DRAW");this.previewEl.dom.innerHTML='';var A=document.createElement("canvas");
 var B=A.getContext("2d");A.width=this.imageEl.OriginWidth*this.getScaleLevel();A.height=this.imageEl.OriginWidth*this.getScaleLevel();var C=this.imageEl.OriginWidth/2;if(this.imageEl.OriginWidth<this.imageEl.OriginHeight){A.width=this.imageEl.OriginHeight*this.getScaleLevel();
-A.height=this.imageEl.OriginHeight*this.getScaleLevel();C=this.imageEl.OriginHeight/2;}B.scale(this.getScaleLevel(),this.getScaleLevel());B.translate(C,C);B.rotate(this.rotate*Math.PI/180);B.drawImage(this.imageEl,0,0,this.imageEl.OriginWidth,this.imageEl.OriginHeight,0,0,this.imageEl.OriginWidth,this.imageEl.OriginHeight);
+A.height=this.imageEl.OriginHeight*this.getScaleLevel();C=this.imageEl.OriginHeight/2;}B.scale(this.getScaleLevel(),this.getScaleLevel());B.translate(1,1);B.rotate(this.rotate*Math.PI/180);B.drawImage(this.imageEl,0,0,this.imageEl.OriginWidth,this.imageEl.OriginHeight,0,0,this.imageEl.OriginWidth,this.imageEl.OriginHeight);
 this.canvasEl=document.createElement("canvas");this.contextEl=this.canvasEl.getContext("2d");switch(this.rotate){case 0:this.canvasEl.width=this.imageEl.OriginWidth*this.getScaleLevel();this.canvasEl.height=this.imageEl.OriginHeight*this.getScaleLevel();this.contextEl.drawImage(A,0,0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height);
 break;case 90:this.canvasEl.width=this.imageEl.OriginHeight*this.getScaleLevel();this.canvasEl.height=this.imageEl.OriginWidth*this.getScaleLevel();if(this.imageEl.OriginWidth>this.imageEl.OriginHeight){this.contextEl.drawImage(A,Math.abs(this.canvasEl.width-this.canvasEl.height),0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height);
 break;}this.contextEl.drawImage(A,0,0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height);break;case 180:this.canvasEl.width=this.imageEl.OriginWidth*this.getScaleLevel();this.canvasEl.height=this.imageEl.OriginHeight*this.getScaleLevel();
diff --git a/roojs-debug.js b/roojs-debug.js
index 0bb1a8119e..7bfc1ad273 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -68823,7 +68823,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         contextEl.scale(this.getScaleLevel(), this.getScaleLevel());
         
-        contextEl.translate(center, center);
+        contextEl.translate(1, 1);
         contextEl.rotate(this.rotate * Math.PI / 180);
 
         contextEl.drawImage(this.imageEl, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight);
diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js
index 071db9eb2e..1f548d8c34 100644
--- a/roojs-ui-debug.js
+++ b/roojs-ui-debug.js
@@ -44331,7 +44331,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         contextEl.scale(this.getScaleLevel(), this.getScaleLevel());
         
-        contextEl.translate(center, center);
+        contextEl.translate(1, 1);
         contextEl.rotate(this.rotate * Math.PI / 180);
 
         contextEl.drawImage(this.imageEl, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight);
diff --git a/roojs-ui.js b/roojs-ui.js
index 12ce2b166e..bc7548c50c 100644
--- a/roojs-ui.js
+++ b/roojs-ui.js
@@ -1970,7 +1970,7 @@ var bh=Math.ceil(this.canvasEl.height/this.getScaleLevel());this.startScale=this
 }this.rotate=(this.rotate>180)?0:this.rotate+90;this.draw();return;}this.scale=this.startScale;this.onRotateFail();return false;}this.rotate=(this.rotate>180)?0:this.rotate+90;if(this.isDocument){this.setThumbBoxSize();this.setThumbBoxPosition();this.setCanvasPosition();
 }this.draw();this.fireEvent('rotate',this,'right');},onRotateFail:function(){this.errorEl.show(true);var A=this;(function(){A.errorEl.hide(true);}).defer(this.errorTimeout);},draw:function(){console.log("DRAW");this.previewEl.dom.innerHTML='';var A=document.createElement("canvas");
 var B=A.getContext("2d");A.width=this.imageEl.OriginWidth*this.getScaleLevel();A.height=this.imageEl.OriginWidth*this.getScaleLevel();var C=this.imageEl.OriginWidth/2;if(this.imageEl.OriginWidth<this.imageEl.OriginHeight){A.width=this.imageEl.OriginHeight*this.getScaleLevel();
-A.height=this.imageEl.OriginHeight*this.getScaleLevel();C=this.imageEl.OriginHeight/2;}B.scale(this.getScaleLevel(),this.getScaleLevel());B.translate(C,C);B.rotate(this.rotate*Math.PI/180);B.drawImage(this.imageEl,0,0,this.imageEl.OriginWidth,this.imageEl.OriginHeight,0,0,this.imageEl.OriginWidth,this.imageEl.OriginHeight);
+A.height=this.imageEl.OriginHeight*this.getScaleLevel();C=this.imageEl.OriginHeight/2;}B.scale(this.getScaleLevel(),this.getScaleLevel());B.translate(1,1);B.rotate(this.rotate*Math.PI/180);B.drawImage(this.imageEl,0,0,this.imageEl.OriginWidth,this.imageEl.OriginHeight,0,0,this.imageEl.OriginWidth,this.imageEl.OriginHeight);
 this.canvasEl=document.createElement("canvas");this.contextEl=this.canvasEl.getContext("2d");switch(this.rotate){case 0:this.canvasEl.width=this.imageEl.OriginWidth*this.getScaleLevel();this.canvasEl.height=this.imageEl.OriginHeight*this.getScaleLevel();this.contextEl.drawImage(A,0,0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height);
 break;case 90:this.canvasEl.width=this.imageEl.OriginHeight*this.getScaleLevel();this.canvasEl.height=this.imageEl.OriginWidth*this.getScaleLevel();if(this.imageEl.OriginWidth>this.imageEl.OriginHeight){this.contextEl.drawImage(A,Math.abs(this.canvasEl.width-this.canvasEl.height),0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height);
 break;}this.contextEl.drawImage(A,0,0,this.canvasEl.width,this.canvasEl.height,0,0,this.canvasEl.width,this.canvasEl.height);break;case 180:this.canvasEl.width=this.imageEl.OriginWidth*this.getScaleLevel();this.canvasEl.height=this.imageEl.OriginHeight*this.getScaleLevel();