roojs-core.js

[roojs1] / roojs-debug.js

diff --git a/roojs-debug.js b/roojs-debug.js
index 7bfc1ad..1ff9eb3 100644 (file)
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -68529,6 +68529,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     setCanvasPosition : function()
     {   
+        console.log("SET CANVAS POSITION");
         if(!this.canvasEl){
             return;
         }
@@ -68543,6 +68544,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     onMouseDown : function(e)
     {   
+        console.log("ON MOUSE DOWN");
         e.stopEvent();
         
         this.dragable = true;
@@ -68560,6 +68562,7 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
     
     onMouseMove : function(e)
     {   
+        console.log ("ON MOUSE MOVE");
         e.stopEvent();
         
         if(!this.canvasLoaded){
@@ -68572,16 +68575,36 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         var minX = Math.ceil(this.thumbEl.getLeft(true));
         var minY = Math.ceil(this.thumbEl.getTop(true));
+
+        console.log("minX");
+        console.log(minX);
+        console.log("minY");
+        console.log(minY);
         
         var maxX = Math.ceil(minX + this.thumbEl.getWidth() - this.canvasEl.width);
         var maxY = Math.ceil(minY + this.thumbEl.getHeight() - this.canvasEl.height);
         
+        console.log("maxX");
+        console.log(maxX);
+        console.log("maxY");
+        console.log(maxY);
+
+        if(minX < maxX && minY < maxY) {
+            return;
+        }
+
         var x = Roo.isTouch ? e.browserEvent.touches[0].pageX : e.getPageX();
         var y = Roo.isTouch ? e.browserEvent.touches[0].pageY : e.getPageY();
+
+        console.log(x);
+        console.log(y);
         
         x = x - this.mouseX;
         y = y - this.mouseY;
         
+        console.log(x);
+        console.log(y);
+        
         var bgX = Math.ceil(x + this.previewEl.getLeft(true));
         var bgY = Math.ceil(y + this.previewEl.getTop(true));
         
@@ -68810,6 +68833,8 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         var canvasEl = document.createElement("canvas");
         
         var contextEl = canvasEl.getContext("2d");
+
+        console.log(this.getScaleLevel());
         
         canvasEl.width = this.imageEl.OriginWidth * this.getScaleLevel();
         canvasEl.height = this.imageEl.OriginWidth * this.getScaleLevel();
@@ -68823,10 +68848,10 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
         
         contextEl.scale(this.getScaleLevel(), this.getScaleLevel());
         
-        contextEl.translate(1, 1);
+        contextEl.translate(center, center);
         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);
+        contextEl.drawImage(this.imageEl, 0, 0, this.imageEl.OriginWidth, this.imageEl.OriginHeight, center * -1, center * -1, this.imageEl.OriginWidth, this.imageEl.OriginHeight);
         
         this.canvasEl = document.createElement("canvas");
         
@@ -69234,7 +69259,11 @@ Roo.extend(Roo.dialog.UploadCropbox, Roo.Component,  {
             }
             
         }
-        
+
+        if(this.imageEl.OriginWidth < this.minWidth || this.imageEl.OriginHeight < this.minHeight) {
+            this.baseScale = width / this.minWidth;
+        }
+        console.log(this.baseScale);
         return;
     },