@leafer/display-module 2.0.1 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display-module",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "@leafer/display-module",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,13 +22,13 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/helper": "2.0.1",
-    "@leafer/event": "2.0.1",
-    "@leafer/math": "2.0.1",
-    "@leafer/data": "2.0.1",
-    "@leafer/debug": "2.0.1"
+    "@leafer/helper": "2.0.3",
+    "@leafer/event": "2.0.3",
+    "@leafer/math": "2.0.3",
+    "@leafer/data": "2.0.3",
+    "@leafer/debug": "2.0.3"
   },
   "devDependencies": {
-    "@leafer/interface": "2.0.1"
+    "@leafer/interface": "2.0.3"
   }
 }

package/src/BranchRender.ts

@@ -1,6 +1,6 @@
-import { ILeaferCanvas, IRenderOptions, IBranchRenderModule } from '@leafer/interface'
+import { ILeaferCanvas, IRenderOptions, IBranchRenderModule, ILeaf } from '@leafer/interface'
 import { BoundsHelper } from '@leafer/math'
-import { LeafBoundsHelper } from '@leafer/helper'
+import { LeafBoundsHelper, LeafHelper } from '@leafer/helper'
 
 
 const { excludeRenderBounds } = LeafBoundsHelper, { hasSize } = BoundsHelper
@@ -40,7 +40,7 @@ export const BranchRender: IBranchRenderModule = {
 
                 this.__renderBranch(tempCanvas, options)
 
-                canvas.opacity = options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity
+                canvas.opacity = options.ignoreOpacity ? 1 : (options.dimOpacity ? data.opacity * options.dimOpacity : data.opacity)
                 canvas.copyWorldByReset(tempCanvas, nowWorld, nowWorld, data.__blendMode, true)
 
                 tempCanvas.recycle(nowWorld)
@@ -62,9 +62,11 @@ export const BranchRender: IBranchRenderModule = {
 
         } else {
 
+            let child: ILeaf
             const { children } = this
             for (let i = 0, len = children.length; i < len; i++) {
-                excludeRenderBounds(children[i], options) || children[i].__render(canvas, options)
+                child = children[i]
+                excludeRenderBounds(child, options) || (child.__hasComplex ? LeafHelper.renderComplex(child, canvas, options) : child.__render(canvas, options))
             }
 
         }

package/src/LeafBounds.ts

@@ -18,6 +18,8 @@ export const LeafBounds: ILeafBoundsModule = {
         const { __layout, __world } = this
         toOuterOf(__layout.renderBounds, __world, __world)
 
+        if (this.__hasComplex) LeafHelper.checkComplex(this) // 必须在重置resize之前执行
+
         if (__layout.resized) {
             if (__layout.resized === 'inner') this.__onUpdateSize() // scale变化不用更新
             if (this.__hasLocalEvent) BoundsEvent.emitLocal(this)
@@ -99,6 +101,8 @@ export const LeafBounds: ILeafBoundsModule = {
             if (this.parent) this.parent.__layout.renderChange()
         }
 
+        if (layout.outerScale) LeafHelper.updateOuterBounds(this)
+
         layout.resized || (layout.resized = 'local')
         layout.boundsChanged = undefined
 

package/src/LeafMatrix.ts

@@ -1,5 +1,6 @@
 import { ILeafMatrixModule, ILayoutData } from '@leafer/interface'
 import { AroundHelper, MatrixHelper } from '@leafer/math'
+import { LeafHelper } from '@leafer/helper'
 
 
 const { setLayout, multiplyParent, translateInner, defaultWorld } = MatrixHelper
@@ -13,6 +14,7 @@ export const LeafMatrix: ILeafMatrixModule = {
         multiplyParent(this.__local || __layout, parent ? (parent.__scrollWorld || parent.__world) : defaultWorld, __world, !!__layout.affectScaleOrRotation, __ as ILayoutData)
 
         if (__scrollWorld) translateInner(Object.assign(__scrollWorld, __world), __.scrollX, __.scrollY)
+        if (__layout.scaleFixed) LeafHelper.updateScaleFixedWorld(this)
     },
 
     __updateLocalMatrix(): void {

package/src/LeafRender.ts

@@ -17,7 +17,7 @@ export const LeafRender: ILeafRenderModule = {
             if (data.bright && !options.topRendering) return options.topList.add(this)
 
             canvas.setWorld(this.__nowWorld = this.__getNowWorld(options))
-            canvas.opacity = options.dimOpacity && !data.dimskip ? data.opacity * options.dimOpacity : data.opacity
+            canvas.opacity = options.ignoreOpacity ? 1 : (options.dimOpacity && !data.dimskip ? data.opacity * options.dimOpacity : data.opacity)
 
             if (this.__.__single) {