@leafer-ui/render 1.6.7 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer-ui/render",
-  "version": "1.6.7",
+  "version": "1.8.0",
   "description": "@leafer-ui/render",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,10 +22,10 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer-ui/external": "1.6.7"
+    "@leafer-ui/external": "1.8.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.6.7",
-    "@leafer-ui/interface": "1.6.7"
+    "@leafer/interface": "1.8.0",
+    "@leafer-ui/interface": "1.8.0"
   }
 }

package/src/RectRender.ts

@@ -19,18 +19,18 @@ export const RectRender: IRectRenderModule = {
 
         if (stroke) {
 
-            const { strokeAlign, __strokeWidth } = this.__
-            if (!__strokeWidth) return
+            const { strokeAlign, __strokeWidth: strokeWidth } = this.__
+            if (!strokeWidth) return
 
-            canvas.setStroke(stroke, __strokeWidth, this.__)
-            const half = __strokeWidth / 2
+            canvas.setStroke(stroke, strokeWidth, this.__)
+            const half = strokeWidth / 2
 
             switch (strokeAlign) {
                 case 'center':
                     canvas.strokeRect(0, 0, width, height)
                     break
                 case 'inside':
-                    width -= __strokeWidth, height -= __strokeWidth
+                    width -= strokeWidth, height -= strokeWidth
                     if (width < 0 || height < 0) {
                         canvas.save()
                         this.__clip(canvas, options)
@@ -39,7 +39,7 @@ export const RectRender: IRectRenderModule = {
                     } else canvas.strokeRect(x + half, y + half, width, height)
                     break
                 case 'outside':
-                    canvas.strokeRect(x - half, y - half, width + __strokeWidth, height + __strokeWidth)
+                    canvas.strokeRect(x - half, y - half, width + strokeWidth, height + strokeWidth)
                     break
             }
 

package/src/UIRender.ts

@@ -11,19 +11,21 @@ export const UIRender: IUIRenderModule = {
     __updateChange(): void {
         const data = this.__
 
+        if (data.__useStroke) {
+            const useStroke = data.__useStroke = !!(data.stroke && data.strokeWidth)
+            stintSet(this.__world, 'half', useStroke && data.strokeAlign === 'center' && data.strokeWidth % 2)  // 是否存在半逻辑像素渲染（奇数线宽的居中线条），可以半像素为起点绘制，防止模糊
+            stintSet(data, '__fillAfterStroke', useStroke && data.strokeAlign === 'outside' && data.fill && !data.__isTransparentFill)
+        }
+
         if (data.__useEffect) {
             const { shadow, fill, stroke } = data, otherEffect = data.innerShadow || data.blur || data.backgroundBlur || data.filter
-            stintSet(data, '__isFastShadow', shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && !(shadow[0].box && data.__isTransparentFill) && fill && !(fill instanceof Array && fill.length > 1) && (this.useFastShadow || !stroke || (stroke && data.strokeAlign === 'inside')))
+            stintSet(data, '__isFastShadow', shadow && !otherEffect && shadow.length < 2 && !shadow[0].spread && fill && !data.__isTransparentFill && !(fill instanceof Array && fill.length > 1) && (this.useFastShadow || !stroke || (stroke && data.strokeAlign === 'inside'))) // 高性能阴影条件， @leafer-ui/image check.ts 中的 allowDraw 逻辑需与此处关联
             data.__useEffect = !!(shadow || otherEffect)
         }
 
-        stintSet(this.__world, 'half', data.__hasHalf)
-
-        stintSet(data, '__fillAfterStroke', data.stroke && data.strokeAlign === 'outside' && data.fill && !data.__isTransparentFill)
-
         data.__checkSingle()
 
-        stintSet(data, '__complex', data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect)
+        stintSet(data, '__complex', (data.__isFills || data.__isStrokes || data.cornerRadius || data.__useEffect) as boolean)
     },
 
     __drawFast(canvas: ILeaferCanvas, options: IRenderOptions): void {
@@ -92,18 +94,14 @@ export const UIRender: IUIRenderModule = {
         }
     },
 
-    __renderShape(canvas: ILeaferCanvas, options: IRenderOptions, ignoreFill?: boolean, ignoreStroke?: boolean): void {
-        if (this.__worldOpacity) {
-            canvas.setWorld(this.__nowWorld = this.__getNowWorld(options))
+    __drawShape(canvas: ILeaferCanvas, options: IRenderOptions): void {
+        this.__drawRenderPath(canvas)
 
-            const { fill, stroke } = this.__
+        const data = this.__, { fill, stroke } = data
 
-            this.__drawRenderPath(canvas)
-
-            if (fill && !ignoreFill) this.__.__isAlphaPixelFill ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill('#000000', this, canvas)
-            if (this.__.__isCanvas) this.__drawAfterFill(canvas, options)
-            if (stroke && !ignoreStroke) this.__.__isAlphaPixelStroke ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke('#000000', this, canvas)
-        }
+        if (fill && !options.ignoreFill) data.__isAlphaPixelFill ? Paint.fills(fill as ILeafPaint[], this, canvas) : Paint.fill('#000000', this, canvas)
+        if (data.__isCanvas) this.__drawAfterFill(canvas, options)
+        if (stroke && !options.ignoreStroke) data.__isAlphaPixelStroke ? Paint.strokes(stroke as ILeafStrokePaint[], this, canvas) : Paint.stroke('#000000', this, canvas)
     },
 
     __drawAfterFill(canvas: ILeaferCanvas, options: IRenderOptions): void {