html2canvas scale fix

devforth · Jan 20, 2018 · d0d9730 · d0d9730
1 parent bb950d0
commit d0d9730
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/js/main.js b/js/main.js
@@ -760,7 +760,7 @@ class PainterroProc {
           ];
           const scale = this.getScale();
           this.curCord = [this.curCord[0] * scale, this.curCord[1] * scale];
-          if (!this.isMobile && e.target.tagName.toLowerCase() !== 'input') {
+          if (e.target.tagName.toLowerCase() !== 'input') {
             e.preventDefault();
           }
         }
@@ -1039,15 +1039,19 @@ class PainterroProc {
       this.scroller.appendChild(div);
       div.innerHTML = '<div style="position:absolute;top:50%;width:100%;transform: translateY(-50%);">' +
         `${this.params.initText}</div>`;
-      div.style.height = '100%';
+      div.style.left = '0';
+      div.style.top = '0';
+      div.style.right = '0';
+      div.style.bottom = '0';
       div.style['text-align'] = 'center';
-      div.style.position = 'relative';
+      div.style.position = 'absolute';
       div.style.color = this.params.initTextColor;
       div.style['font-family'] = this.params.initTextStyle.split(/ (.+)/)[1];
       div.style['font-size'] = this.params.initTextStyle.split(/ (.+)/)[0];
 
       html2canvas(div, {
         logging: false,
+        scale: 1,
       }).then((can) => {
         this.scroller.removeChild(div);
         this.ctx.drawImage(can, 0, 0);

diff --git a/js/text.js b/js/text.js
@@ -224,6 +224,7 @@ export default class TextTool {
     this.input.style.border = 'none';
     html2canvas(this.input, {
       logging: false,
+      scale: 1,
     }).then((can) => {
       this.ctx.drawImage(can, this.scaledCord[0], this.scaledCord[1]);
       this.input.style.border = origBorder;