@galacean/engine-ui 1.6.0-alpha.1 → 1.6.0-alpha.2

package/dist/module.js

@@ -556,14 +556,30 @@ var Utils = /*#__PURE__*/ function() {
     _proto._cloneTo = function _cloneTo(target, srcRoot, targetRoot) {
         // @ts-ignore
         Transform.prototype._cloneTo.call(this, target, srcRoot, targetRoot);
-        target.size.copyFrom(this._size);
-        target.pivot.copyFrom(this._pivot);
+        var size = target._size, pivot = target._pivot;
+        // @ts-ignore
+        size._onValueChanged = pivot._onValueChanged = null;
+        size.copyFrom(this._size);
+        pivot.copyFrom(this._pivot);
+        // @ts-ignore
+        size._onValueChanged = target._onSizeChanged;
+        // @ts-ignore
+        pivot._onValueChanged = target._onPivotChanged;
     };
     _proto._onLocalMatrixChanging = function _onLocalMatrixChanging() {
-        this._updatePositionByAlignment();
+        // `super._onLocalMatrixChanging()` will set `LocalMatrix` dirty flag `false`
+        // If there is an alignment, `position` and `localMatrix` will be reset again
+        if (this._horizontalAlignment || this._verticalAlignment) {
+            this._updatePositionByAlignment();
+            this._setDirtyFlagTrue(TransformModifyFlags.LocalMatrix);
+        } else {
+            Transform.prototype._onLocalMatrixChanging.call(this);
+        }
     };
-    _proto._onWorldMatrixChange = function _onWorldMatrixChange() {
-        !this._horizontalAlignment && !this._verticalAlignment && Transform.prototype._onWorldMatrixChange.call(this);
+    _proto._onWorldMatrixChanging = function _onWorldMatrixChanging() {
+        // `super._onWorldMatrixChanging()` will set `WorldMatrix` dirty flag `false`
+        // If there is an alignment, `position` and `worldMatrix` will be reset again(`worldMatrix` dirty flag is already `true`)
+        !this._horizontalAlignment && !this._verticalAlignment && Transform.prototype._onWorldMatrixChanging.call(this);
     };
     _proto._onPositionChanged = function _onPositionChanged() {
         (this._horizontalAlignment || this._verticalAlignment) && this._updatePositionByAlignment();
@@ -629,7 +645,7 @@ var Utils = /*#__PURE__*/ function() {
             size._onValueChanged = this._onSizeChanged;
         }
     };
-    _proto._updateRectByPivot = function _updateRectByPivot() {
+    _proto._updateRectBySizeAndPivot = function _updateRectBySizeAndPivot() {
         var _this = this, size = _this.size, pivot = _this._pivot;
         var x = -pivot.x * size.x;
         var y = -pivot.y * size.y;
@@ -639,13 +655,13 @@ var Utils = /*#__PURE__*/ function() {
         if (this._horizontalAlignment === HorizontalAlignmentMode.LeftAndRight || this._verticalAlignment === VerticalAlignmentMode.TopAndBottom) {
             this._updateSizeByAlignment();
         }
-        this._updateRectByPivot();
+        this._updateRectBySizeAndPivot();
         this._updateWorldFlagWithSelfRectChange();
         // @ts-ignore
         this._entity._updateFlagManager.dispatch(512);
     };
     _proto._onPivotChanged = function _onPivotChanged() {
-        this._updateRectByPivot();
+        this._updateRectBySizeAndPivot();
         this._updateWorldFlagWithSelfRectChange();
         // @ts-ignore
         this._entity._updateFlagManager.dispatch(1024);
@@ -672,7 +688,7 @@ var Utils = /*#__PURE__*/ function() {
             if (horizontalAlignment || verticalAlignment) {
                 if (horizontalAlignment === HorizontalAlignmentMode.LeftAndRight || verticalAlignment === VerticalAlignmentMode.TopAndBottom) {
                     this._updateSizeByAlignment();
-                    this._updateRectByPivot();
+                    this._updateRectBySizeAndPivot();
                     selfChange = true;
                 }
                 this._updatePositionByAlignment();
@@ -895,13 +911,13 @@ var Utils = /*#__PURE__*/ function() {
     return UITransform;
 }(Transform);
 __decorate([
-    deepClone
+    ignoreClone
 ], UITransform.prototype, "_size", void 0);
 __decorate([
-    deepClone
+    ignoreClone
 ], UITransform.prototype, "_pivot", void 0);
 __decorate([
-    ignoreClone
+    deepClone
 ], UITransform.prototype, "_rect", void 0);
 __decorate([
     ignoreClone
@@ -2697,6 +2713,7 @@ __decorate([
     };
     _proto._buildChunk = function _buildChunk(textChunk, count) {
         var _this_color = this.color, r = _this_color.r, g = _this_color.g, b = _this_color.b, a = _this_color.a;
+        var finalAlpha = a * this._getGlobalAlpha();
         var tempIndices = CharRenderInfo.triangles;
         var tempIndicesLength = tempIndices.length;
         var subChunk = textChunk.subChunk = this._getChunkManager().allocateSubChunk(count * 4);
@@ -2717,7 +2734,7 @@ __decorate([
                 vertices[vo + 2] = r;
                 vertices[vo + 3] = g;
                 vertices[vo + 4] = b;
-                vertices[vo + 5] = a;
+                vertices[vo + 5] = finalAlpha;
             }
         }
         return subChunk;