From 1a6a08395c77251b49d5b770b9f957747369a128 Mon Sep 17 00:00:00 2001
From: 0JARVIS0 <709406687@qq.com>
Date: Tue, 20 Oct 2020 17:58:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E7=BB=98=E5=88=B6=E5=AF=BC=E8=87=B4=E7=9A=84=E5=B0=BA=E5=AF=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 painter.js   | 26 ++++++++++++++++++--------
 painter.wxml |  6 +++---
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/painter.js b/painter.js
index f78a300..c2da727 100644
--- a/painter.js
+++ b/painter.js
@@ -668,19 +668,33 @@ Component({
           return;
         }
 
+        let needScale = false;
         // 生成图片时，根据设置的像素值重新绘制
-        this.canvasWidthInPx = width.toPx();
+        if (width.toPx() !== this.canvasWidthInPx) {
+          this.canvasWidthInPx = width.toPx();
+          needScale = this.properties.use2D;
+        }
         if (this.properties.widthPixels) {
           setStringPrototype(this.screenK, this.properties.widthPixels / this.canvasWidthInPx)
           this.canvasWidthInPx = this.properties.widthPixels
         }
 
-        this.canvasHeightInPx = height.toPx();
+        if (this.canvasHeightInPx !== height.toPx()) {
+          this.canvasHeightInPx = height.toPx();
+          needScale = needScale || this.properties.use2D;
+        }
         this.setData({
           photoStyle: `width:${this.canvasWidthInPx}px;height:${this.canvasHeightInPx}px;`,
         });
-        this.photoContext || (this.photoContext = await this.getCanvasContext(this.properties.use2D, 'photo'));
-
+        if (!this.photoContext) {
+          this.photoContext = await this.getCanvasContext(this.properties.use2D, 'photo');
+        }
+        if (needScale) {
+          const scale = getApp().systemInfo.pixelRatio;
+          this.photoContext.width = this.canvasWidthInPx * scale;
+          this.photoContext.height = this.canvasHeightInPx * scale;
+          this.photoContext.scale(scale, scale);
+        }
         new Pen(this.photoContext, palette).paint(() => {
           this.saveImgToLocal();
         });
@@ -784,10 +798,6 @@ Component({
             that.canvasNode = res[0].node;
             const ctx = that.canvasNode.getContext('2d');
             const wxCanvas = new WxCanvas('2d', ctx, id, true, that.canvasNode);
-            const dpr = Math.min(2, getApp().systemInfo.pixelRatio)
-            wxCanvas.width = res[0].width * dpr
-            wxCanvas.height = res[0].height * dpr
-            wxCanvas.scale(dpr, dpr)
             resolve(wxCanvas);
           });
         } else {
diff --git a/painter.wxml b/painter.wxml
index c53935a..bd7a3b6 100644
--- a/painter.wxml
+++ b/painter.wxml
@@ -14,8 +14,8 @@
       disable-scroll="{{true}}" />
   </block>
   <block wx:if="{{use2D}}">
-    <canvas type="2d" id="photo" style="{{photoStyle}};position: absolute; left: -9999px; top: -9999rpx;" />
-    <canvas type="2d" id="bottom" style="{{painterStyle}};position: absolute;" />
+    <canvas type="2d" id="photo" style="{{photoStyle}};" />
+    <!-- <canvas type="2d" id="bottom" style="{{painterStyle}};position: absolute;" />
     <canvas type="2d" id="k-canvas" style="{{painterStyle}};position: absolute;" />
     <canvas type="2d" id="top" style="{{painterStyle}};position: absolute;" />
     <canvas 
@@ -26,6 +26,6 @@
       bindtouchmove="onTouchMove"
       bindtouchend="onTouchEnd"
       bindtouchcancel="onTouchCancel"
-      disable-scroll="{{true}}" />
+      disable-scroll="{{true}}" /> -->
   </block>
 </view>