@onerjs/gui 8.31.3 → 8.31.5

package/2D/controls/control.d.ts

@@ -91,6 +91,8 @@ export declare class Control implements IAnimatable, IFocusableControl {
     /** @internal */
     _invertTransformMatrix: Matrix2D;
     /** @internal */
+    _noRootTransformMatrix: Matrix2D;
+    /** @internal */
     protected _transformedPosition: Vector2;
     private _isMatrixDirty;
     private _cachedOffsetX;
@@ -116,6 +118,8 @@ export declare class Control implements IAnimatable, IFocusableControl {
     private _gradient;
     /** @internal */
     protected _rebuildLayout: boolean;
+    private _transformedMeasure;
+    isRoot: boolean;
     /** @internal */
     protected _urlRewriter?: (url: string) => string;
     /**

package/2D/controls/control.js

@@ -30,7 +30,7 @@ export class Control {
      * Gets the transformed measure, that is the bounding box of the control after applying all transformations
      */
     get transformedMeasure() {
-        return this._evaluatedMeasure;
+        return this._transformedMeasure;
     }
     /**
      * Sets/Gets a boolean indicating if the children are clipped to the current control bounds.
@@ -968,6 +968,8 @@ export class Control {
         /** @internal */
         this._invertTransformMatrix = Matrix2D.Identity();
         /** @internal */
+        this._noRootTransformMatrix = Matrix2D.Identity();
+        /** @internal */
         this._transformedPosition = Vector2.Zero();
         this._isMatrixDirty = true;
         this._isVisible = true;
@@ -989,6 +991,8 @@ export class Control {
         this._gradient = null;
         /** @internal */
         this._rebuildLayout = false;
+        this._transformedMeasure = Measure.Empty();
+        this.isRoot = false;
         /**
          * Observable that fires when the control's enabled state changes
          */
@@ -1451,9 +1455,11 @@ export class Control {
         if (!this._isMatrixDirty && this._scaleX === 1 && this._scaleY === 1 && this._rotation === 0) {
             return;
         }
+        const offsetW = this._currentMeasure.width * this._transformCenterX;
+        const offsetH = this._currentMeasure.height * this._transformCenterY;
         // postTranslate
-        const offsetX = this._currentMeasure.width * this._transformCenterX + this._currentMeasure.left;
-        const offsetY = this._currentMeasure.height * this._transformCenterY + this._currentMeasure.top;
+        const offsetX = offsetW + this._currentMeasure.left;
+        const offsetY = offsetH + this._currentMeasure.top;
         if (context) {
             context.translate(offsetX, offsetY);
             // rotate
@@ -1470,8 +1476,15 @@ export class Control {
             this._isMatrixDirty = false;
             this._flagDescendantsAsMatrixDirty();
             Matrix2D.ComposeToRef(-offsetX, -offsetY, this._rotation, this._scaleX, this._scaleY, this.parent ? this.parent._transformMatrix : null, this._transformMatrix);
+            if (this.isRoot) {
+                Matrix2D.ComposeToRef(-offsetX, -offsetY, 0, 1, 1, null, this._noRootTransformMatrix);
+            }
+            else {
+                Matrix2D.ComposeToRef(-offsetX, -offsetY, this._rotation, this._scaleX, this._scaleY, this.parent ? this.parent._noRootTransformMatrix : null, this._noRootTransformMatrix);
+            }
             this._transformMatrix.invertToRef(this._invertTransformMatrix);
             this._currentMeasure.transformToRef(this._transformMatrix, this._evaluatedMeasure);
+            this._currentMeasure.transformToRef(this._noRootTransformMatrix, this._transformedMeasure);
         }
     }
     /**