@leafer/display 1.6.7 → 1.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leafer/display",
-  "version": "1.6.7",
+  "version": "1.8.0",
   "description": "@leafer/display",
   "author": "Chao (Leafer) Wan",
   "license": "MIT",
@@ -22,17 +22,18 @@
     "leaferjs"
   ],
   "dependencies": {
-    "@leafer/math": "1.6.7",
-    "@leafer/data": "1.6.7",
-    "@leafer/layout": "1.6.7",
-    "@leafer/display-module": "1.6.7",
-    "@leafer/event": "1.6.7",
-    "@leafer/decorator": "1.6.7",
-    "@leafer/helper": "1.6.7",
-    "@leafer/debug": "1.6.7",
-    "@leafer/platform": "1.6.7"
+    "@leafer/math": "1.8.0",
+    "@leafer/data": "1.8.0",
+    "@leafer/layout": "1.8.0",
+    "@leafer/display-module": "1.8.0",
+    "@leafer/event": "1.8.0",
+    "@leafer/decorator": "1.8.0",
+    "@leafer/helper": "1.8.0",
+    "@leafer/image": "1.8.0",
+    "@leafer/debug": "1.8.0",
+    "@leafer/platform": "1.8.0"
   },
   "devDependencies": {
-    "@leafer/interface": "1.6.7"
+    "@leafer/interface": "1.8.0"
   }
 }

package/src/Leaf.ts

@@ -1,4 +1,4 @@
-import { ILeaferBase, ILeaf, ILeafInputData, ILeafData, ILeaferCanvas, IRenderOptions, IBoundsType, ILocationType, IMatrixWithBoundsData, ILayoutBoundsData, IValue, ILeafLayout, InnerId, IHitCanvas, IRadiusPointData, IEventListenerMap, IEventListener, IEventListenerId, IEvent, IObject, IFunction, IPointData, IBoundsData, IBranch, IFindMethod, IMatrixData, IAttrDecorator, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAlign, IJSONOptions, IEventParamsMap, IEventOption, IAxis, IMotionPathData, IUnitData, IRotationPointData, ITransition, IValueFunction, IEventParams } from '@leafer/interface'
+import { ILeaferBase, ILeaf, ILeafInputData, ILeafData, ILeaferCanvas, IRenderOptions, IBoundsType, ILocationType, IMatrixWithBoundsData, ILayoutBoundsData, IValue, ILeafLayout, InnerId, IHitCanvas, IRadiusPointData, IEventListenerMap, IEventListener, IEventListenerId, IEvent, IObject, IFunction, IPointData, IBoundsData, IBranch, IFindMethod, IMatrixData, IAttrDecorator, IMatrixWithBoundsScaleData, IMatrixWithScaleData, IAlign, IJSONOptions, IEventParamsMap, IEventOption, IAxis, IMotionPathData, IUnitData, IRotationPointData, ITransition, IValueFunction, IEventParams, IScaleData } from '@leafer/interface'
 import { BoundsHelper, IncrementId, MatrixHelper, PointHelper } from '@leafer/math'
 import { LeafData } from '@leafer/data'
 import { LeafLayout } from '@leafer/layout'
@@ -6,9 +6,11 @@ import { LeafDataProxy, LeafMatrix, LeafBounds, LeafEventer, LeafRender } from '
 import { boundsType, useModule, defineDataProcessor } from '@leafer/decorator'
 import { LeafHelper } from '@leafer/helper'
 import { ChildEvent } from '@leafer/event'
+import { ImageManager } from '@leafer/image'
 import { Plugin } from '@leafer/debug'
 
 
+const tempScaleData = {} as IScaleData
 const { LEAF, create } = IncrementId
 const { toInnerPoint, toOuterPoint, multiplyParent } = MatrixHelper
 const { toOuterOf } = BoundsHelper
@@ -347,6 +349,20 @@ export class Leaf implements ILeaf {
         }
     }
 
+    public getClampRenderScale(): number {
+        let { scaleX } = this.__nowWorld || this.__world
+        if (scaleX < 0) scaleX = -scaleX
+        return scaleX > 1 ? scaleX : 1
+    }
+
+    public getRenderScaleData(abs?: boolean, scaleFixed?: boolean): IScaleData {
+        const { scaleX, scaleY } = ImageManager.patternLocked ? this.__world : this.__nowWorld
+        if (scaleFixed) tempScaleData.scaleX = tempScaleData.scaleY = 1
+        else if (abs) tempScaleData.scaleX = scaleX < 0 ? -scaleX : scaleX, tempScaleData.scaleY = scaleY < 0 ? -scaleY : scaleY
+        else tempScaleData.scaleX = scaleX, tempScaleData.scaleY = scaleY
+        return tempScaleData
+    }
+
     public getTransform(relative?: ILocationType | ILeaf): IMatrixData {
         return this.__layout.getTransform(relative || 'local')
     }
@@ -569,7 +585,9 @@ export class Leaf implements ILeaf {
 
     public __clip(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
 
-    public __renderShape(_canvas: ILeaferCanvas, _options: IRenderOptions, _ignoreFill?: boolean, _ignoreStroke?: boolean): void { }
+    public __renderShape(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
+
+    public __drawShape(_canvas: ILeaferCanvas, _options: IRenderOptions): void { }
 
 
     public __updateWorldOpacity(): void { }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventParamsMap, IEventListenerMap, ILeafInputData, IFunction, IObject, IValue, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, ITransition, IAlign, IAxis, IRadiusPointData, IMotionPathData, IUnitData, IRotationPointData, IEventParams, IEventListener, IEventOption, IEventListenerId, IEvent, IValueFunction, IAttrDecorator } from '@leafer/interface';
+import { ILeaf, InnerId, ILeaferBase, ILeafData, ILeafLayout, IMatrixWithBoundsScaleData, IMatrixWithBoundsData, IMatrixData, IBoundsData, IMatrixWithScaleData, IHitCanvas, IEventParamsMap, IEventListenerMap, ILeafInputData, IFunction, IObject, IValue, IJSONOptions, IFindMethod, ILeaferCanvas, IRenderOptions, IScaleData, ILocationType, IBoundsType, ILayoutBoundsData, IPointData, ITransition, IAlign, IAxis, IRadiusPointData, IMotionPathData, IUnitData, IRotationPointData, IEventParams, IEventListener, IEventOption, IEventListenerId, IEvent, IValueFunction, IAttrDecorator } from '@leafer/interface';
 import { LeafData } from '@leafer/data';
 import { LeafLayout } from '@leafer/layout';
 
@@ -108,6 +108,8 @@ declare class Leaf implements ILeaf {
     __updateMask(_value?: boolean): void;
     __renderMask(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __getNowWorld(options: IRenderOptions): IMatrixWithBoundsScaleData;
+    getClampRenderScale(): number;
+    getRenderScaleData(abs?: boolean, scaleFixed?: boolean): IScaleData;
     getTransform(relative?: ILocationType | ILeaf): IMatrixData;
     getBounds(type?: IBoundsType, relative?: ILocationType | ILeaf): IBoundsData;
     getLayoutBounds(type?: IBoundsType, relative?: ILocationType | ILeaf, unscale?: boolean): ILayoutBoundsData;
@@ -157,7 +159,8 @@ declare class Leaf implements ILeaf {
     __drawFast(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __draw(_canvas: ILeaferCanvas, _options: IRenderOptions, _originCanvas?: ILeaferCanvas): void;
     __clip(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
-    __renderShape(_canvas: ILeaferCanvas, _options: IRenderOptions, _ignoreFill?: boolean, _ignoreStroke?: boolean): void;
+    __renderShape(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
+    __drawShape(_canvas: ILeaferCanvas, _options: IRenderOptions): void;
     __updateWorldOpacity(): void;
     __updateChange(): void;
     __drawPath(_canvas: ILeaferCanvas): void;