babylonjs-gui 9.31.3 → 9.32.1

package/babylon.gui.d.ts

@@ -4180,8 +4180,10 @@ declare namespace BABYLON.GUI {
         /** @internal */
         _isFullscreen: boolean;
         private _fullscreenViewport;
-        private _idealWidth;
-        private _idealHeight;
+        /** @internal */
+        _idealWidth: number;
+        /** @internal */
+        _idealHeight: number;
         private _useSmallestIdeal;
         private _renderAtIdealSize;
         private _focusedControl;
@@ -7642,6 +7644,7 @@ declare namespace BABYLON.GUI {
          */
         _processObservables(type: number, x: number, y: number, pi: BABYLON.Nullable<BABYLON.PointerInfoBase>, pointerId: number, buttonIndex: number, deltaX?: number, deltaY?: number): boolean;
         private _getStyleProperty;
+        private _getFont;
         private _prepareFont;
         /**
          * A control has a dimension fully defined if that dimension doesn't depend on the parent's dimension.
@@ -7672,6 +7675,7 @@ declare namespace BABYLON.GUI {
         parse(serializedObject: any, host?: AdvancedDynamicTexture, urlRewriter?: (url: string) => string): Control;
         /**
          * Serializes the current control
+         * Preserves the live layout and cached font metrics when adaptive scaling is enabled.
          * @param serializationObject defined the JSON serialized object
          * @param force if the control should be serialized even if the isSerializable flag is set to false (default false)
          * @param allowCanvas defines if the control is allowed to use a Canvas2D object to serialize (true by default)

package/babylon.gui.es5.js

@@ -875,12 +875,13 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
         else if (e === t.PointerEventTypes.POINTERTAP)
             return this._host._lastControlDown[n] && this._host._lastControlDown[n]._onPointerPick(this, this._dummyVector2, n, o, !0, a), delete this._host._lastControlDown[n], !0; return !1; };
         e.prototype._getStyleProperty = function (e, t) { var i; var s = null !== (i = this._style && this._style[e]) && void 0 !== i ? i : this[e]; return !s && this.parent ? this.parent._getStyleProperty(e, t) : this.parent ? s : t; };
+        e.prototype._getFont = function () { return this._getStyleProperty("fontStyle", "") + " " + this._getStyleProperty("fontWeight", "") + " " + this.fontSizeInPixels + "px " + this._getStyleProperty("fontFamily", "Arial"); };
         e.prototype._prepareFont = function () {
             var e_6, _a;
             var t, i;
             if (!this._font && !this._fontSet)
                 return;
-            this._font = this._getStyleProperty("fontStyle", "") + " " + this._getStyleProperty("fontWeight", "") + " " + this.fontSizeInPixels + "px " + this._getStyleProperty("fontFamily", "Arial"), this._fontOffset = e._GetFontOffset(this._font, null === (i = null === (t = this._host) || void 0 === t ? void 0 : t.getScene()) || void 0 === i ? void 0 : i.getEngine());
+            this._font = this._getFont(), this._fontOffset = e._GetFontOffset(this._font, null === (i = null === (t = this._host) || void 0 === t ? void 0 : t.getScene()) || void 0 === i ? void 0 : i.getEngine());
             var s = this.getDescendants();
             try {
                 for (var s_4 = __values(s), s_4_1 = s_4.next(); !s_4_1.done; s_4_1 = s_4.next()) {
@@ -903,13 +904,20 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
             var _this = this;
             return this._urlRewriter = s, t.SerializationHelper.Parse(function () { return _this; }, e, null), this.name = e.name, this._parseFromContent(e, null != i ? i : this._host), this;
         };
-        e.prototype.serialize = function (e, i, s) {
-            if (i === void 0) { i = !1; }
-            if (s === void 0) { s = !0; }
-            if (!this.isSerializable && !i)
+        e.prototype.serialize = function (i, s, a) {
+            if (s === void 0) { s = !1; }
+            if (a === void 0) { a = !0; }
+            var n, o, r;
+            if (!this.isSerializable && !s)
                 return;
-            var a = 0, n = 0;
-            this.host && (n = this.host.idealHeight, a = this.host.idealWidth, this.host.idealWidth = 0, this.host.idealHeight = 0), t.SerializationHelper.Serialize(this, e), e.name = this.name, e.className = this.getClassName(), s && this._prepareFont(), this._fontFamily && (e.fontFamily = this._fontFamily), this.fontSize && (e.fontSize = this.fontSize), this.fontWeight && (e.fontWeight = this.fontWeight), this.fontStyle && (e.fontStyle = this.fontStyle), this._gradient && (e.gradient = {}, this._gradient.serialize(e.gradient)), t.SerializationHelper.AppendSerializedAnimations(this, e), this.host && (this.host.idealWidth = a, this.host.idealHeight = n);
+            var l = this._host, _ = null !== (n = null == l ? void 0 : l.idealWidth) && void 0 !== n ? n : 0, h = null !== (o = null == l ? void 0 : l.idealHeight) && void 0 !== o ? o : 0;
+            l && (l._idealWidth = 0, l._idealHeight = 0);
+            try {
+                t.SerializationHelper.Serialize(this, i), i.name = this.name, i.className = this.getClassName(), a && (this._font || this._fontSet) && (i.fontOffset = e._GetFontOffset(this._getFont(), null === (r = null == l ? void 0 : l.getScene()) || void 0 === r ? void 0 : r.getEngine())), this._fontFamily && (i.fontFamily = this._fontFamily), this.fontSize && (i.fontSize = this.fontSize), this.fontWeight && (i.fontWeight = this.fontWeight), this.fontStyle && (i.fontStyle = this.fontStyle), this._gradient && (i.gradient = {}, this._gradient.serialize(i.gradient)), t.SerializationHelper.AppendSerializedAnimations(this, i);
+            }
+            finally {
+                l && (l._idealWidth = _, l._idealHeight = h);
+            }
         };
         e.prototype._parseFromContent = function (e, i, s) { var a, n; if (e.fontFamily && (this.fontFamily = e.fontFamily), e.fontSize && (this.fontSize = e.fontSize), e.fontWeight && (this.fontWeight = e.fontWeight), e.fontStyle && (this.fontStyle = e.fontStyle), e.gradient) {
             var i_7 = t.Tools.Instantiate("BABYLON.GUI." + e.gradient.className);