@onerjs/gui 8.31.4 → 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,7 @@ 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.
@@ -967,14 +967,8 @@ export class Control {
         this._transformMatrix = Matrix2D.Identity();
         /** @internal */
         this._invertTransformMatrix = Matrix2D.Identity();
-        // /** @internal */
-        // public _transformMatrix2 = Matrix2D.Identity();
-        // /** @internal */
-        // public _invertTransformMatrix2 = Matrix2D.Identity();
-        // /** @internal */
-        // private _cachedOffsetX2: number;
-        // /** @internal */
-        // private _cachedOffsetY2: number;
+        /** @internal */
+        this._noRootTransformMatrix = Matrix2D.Identity();
         /** @internal */
         this._transformedPosition = Vector2.Zero();
         this._isMatrixDirty = true;
@@ -997,6 +991,7 @@ 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
@@ -1480,9 +1475,16 @@ export class Control {
             this._cachedOffsetY = offsetY;
             this._isMatrixDirty = false;
             this._flagDescendantsAsMatrixDirty();
-            Matrix2D.ComposeToRef(-offsetX, -offsetY, this.isRoot ? 0 : this._rotation, this.isRoot ? 1 : this._scaleX, this.isRoot ? 1 : this._scaleY, this.parent ? this.parent._transformMatrix : null, this._transformMatrix);
+            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);
         }
     }
     /**