@leafer/display-module 1.6.2 → 1.6.3

package/package.json

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

package/src/LeafBounds.ts

@@ -2,6 +2,7 @@ import { ILeafBoundsModule } from '@leafer/interface'
 import { BoundsHelper } from '@leafer/math'
 import { PathBounds } from '@leafer/path'
 import { BranchHelper, LeafHelper } from '@leafer/helper'
+import { BoundsEvent } from '@leafer/event'
 
 
 const { updateMatrix, updateAllMatrix } = LeafHelper
@@ -13,13 +14,18 @@ export const LeafBounds: ILeafBoundsModule = {
 
     __updateWorldBounds(): void {
 
-        toOuterOf(this.__layout.renderBounds, this.__world, this.__world)
+        const layout = this.__layout
+
+        toOuterOf(layout.renderBounds, this.__world, this.__world)
 
-        if (this.__layout.resized) {
-            this.__onUpdateSize()
-            this.__layout.resized = false
+        if (layout.resized) {
+            if (layout.resized === 'inner') this.__onUpdateSize() // scale变化不用更新
+            if (this.__hasLocalEvent) BoundsEvent.emitLocal(this)
+            layout.resized = undefined
         }
 
+        if (this.__hasWorldEvent) BoundsEvent.emitWorld(this)
+
     },
 
     __updateLocalBounds(): void {
@@ -32,14 +38,14 @@ export const LeafBounds: ILeafBoundsModule = {
             this.__updateRenderPath()
 
             this.__updateBoxBounds()
-            layout.resized = true
+            layout.resized = 'inner'
         }
 
 
         if (layout.localBoxChanged) { // position change
 
             if (this.__local) this.__updateLocalBoxBounds()
-            layout.localBoxChanged = false
+            layout.localBoxChanged = undefined
 
             if (layout.strokeSpread) layout.strokeChanged = true
             if (layout.renderSpread) layout.renderChanged = true
@@ -47,7 +53,7 @@ export const LeafBounds: ILeafBoundsModule = {
         }
 
 
-        layout.boxChanged = false // must after updateLocalBoxBounds()
+        layout.boxChanged = undefined // must after updateLocalBoxBounds()
 
 
         if (layout.strokeChanged) {
@@ -65,11 +71,11 @@ export const LeafBounds: ILeafBoundsModule = {
                 layout.spreadStrokeCancel()
             }
 
-            layout.strokeChanged = false
+            layout.strokeChanged = undefined
             if (layout.renderSpread || layout.strokeSpread !== layout.strokeBoxSpread) layout.renderChanged = true
 
             if (this.parent) this.parent.__layout.strokeChange()
-            layout.resized = true
+            layout.resized = 'inner'
         }
 
 
@@ -88,12 +94,13 @@ export const LeafBounds: ILeafBoundsModule = {
                 layout.spreadRenderCancel()
             }
 
-            layout.renderChanged = false
+            layout.renderChanged = undefined
 
             if (this.parent) this.parent.__layout.renderChange()
         }
 
-        layout.boundsChanged = false
+        layout.resized || (layout.resized = 'local')
+        layout.boundsChanged = undefined
 
     },
 

package/src/LeafMatrix.ts

@@ -21,9 +21,9 @@ export const LeafMatrix: ILeafMatrixModule = {
 
             if (layout.affectScaleOrRotation) {
 
-                if (layout.scaleChanged || layout.rotationChanged) {
+                if ((layout.scaleChanged && (layout.resized = 'scale')) || layout.rotationChanged) {
                     setLayout(local, data as ILayoutData, null, null, layout.affectRotation)
-                    layout.scaleChanged = layout.rotationChanged = false
+                    layout.scaleChanged = layout.rotationChanged = undefined
                 }
 
             }
@@ -38,7 +38,7 @@ export const LeafMatrix: ILeafMatrixModule = {
 
         }
 
-        this.__layout.matrixChanged = false
+        this.__layout.matrixChanged = undefined
 
     }