Force resize description to contents on creation, and resize container to contents

lodicolo · lodicolo · commit 79ae52e7e5e6 · 2025-03-02T19:20:09.000-05:00
diff --git a/Intersect.Client.Core/Interface/Game/DescriptionWindows/Components/DescriptionComponent.cs b/Intersect.Client.Core/Interface/Game/DescriptionWindows/Components/DescriptionComponent.cs
@@ -16,6 +16,8 @@ protected override void GenerateComponents()
         base.GenerateComponents();
 
         mDescription = new RichLabel(mContainer, "Description");
+        mDescription.SizeChanged += (_, _) => mContainer.SizeToChildren();
+
     }
 
     /// <summary>
@@ -42,6 +44,7 @@ public override void CorrectWidth()
         var margins = mDescription.Margin;
 
         mDescription.SetSize(mContainer.InnerWidth - margins.Right, mContainer.InnerHeight);
+        mDescription.ForceImmediateRebuild();
         mDescription.SizeToChildren(false, true);
         mDescription.SetSize(mDescription.Width, mDescription.Height + margins.Bottom);
         mContainer.SizeToChildren(false, true);
diff --git a/Intersect.Client.Core/MonoGame/Graphics/MonoFont.cs b/Intersect.Client.Core/MonoGame/Graphics/MonoFont.cs
@@ -43,7 +43,14 @@ public SpriteFont Instance
             {
                 try
                 {
-                    return _instance ??= PlatformObjectFactory();
+                    // ReSharper disable once InvertIf
+                    if (_instance == null)
+                    {
+                        _instance = PlatformObjectFactory();
+                        _instance.Texture.Name = $"{FontName} @ {Size}pt";
+                    }
+
+                    return _instance;
                 }
                 catch (Exception exception)
                 {
diff --git a/Intersect.Client.Core/MonoGame/Graphics/MonoRenderer.cs b/Intersect.Client.Core/MonoGame/Graphics/MonoRenderer.cs
@@ -1008,8 +1008,13 @@ public override GameShader LoadShader(string shaderName)
         return new Shader(this, shaderName, _contentManager);
     }
 
-    public override System.Numerics.Vector2 MeasureText(string text, IFont? font, int size, float fontScale)
+    public override System.Numerics.Vector2 MeasureText(string? text, IFont? font, int size, float fontScale)
     {
+        if (string.IsNullOrWhiteSpace(text))
+        {
+            return default;
+        }
+
         if (font is not Font<SpriteFont> platformFont)
         {
             return default;
diff --git a/Intersect.Client.Framework/Gwen/Control/ImagePanel.cs b/Intersect.Client.Framework/Gwen/Control/ImagePanel.cs
@@ -354,14 +354,17 @@ protected override void Render(Skin.Base skin)
         if (TextureNinePatchMargin is { } textureNinePatchMargin)
         {
             var sourceBounds = _textureSourceBounds;
-            _ninepatchRenderer ??= new Bordered(
-                texture,
-                sourceBounds.X,
-                sourceBounds.Y,
-                sourceBounds.Width,
-                sourceBounds.Height,
-                textureNinePatchMargin
-            );
+            if (_ninepatchRenderer == null || _ninepatchRenderer.Value.Margin != textureNinePatchMargin)
+            {
+                _ninepatchRenderer = new Bordered(
+                    texture,
+                    sourceBounds.X,
+                    sourceBounds.Y,
+                    sourceBounds.Width,
+                    sourceBounds.Height,
+                    textureNinePatchMargin
+                );
+            }
 
             if (_ninepatchRenderer is { } ninepatchRenderer)
             {
diff --git a/Intersect.Client.Framework/Gwen/Control/RichLabel.cs b/Intersect.Client.Framework/Gwen/Control/RichLabel.cs
@@ -494,6 +494,7 @@ bool noSplit
             Alignment = [block.Alignment],
             AutoSizeToContents = true,
             Font = font,
+            FontSize = block.FontSize,
             RestrictToParent = false,
             Text = x == 0 ? text.TrimStart(' ') : text,
             TextAlign = Pos.None,
@@ -583,6 +584,12 @@ protected override void OnSizeChanged(Point oldSize, Point newSize)
             }
         }
 
+        ApplicationContext.CurrentContext.Logger.LogDebug(
+            "Rebuilding due to size change from {OldSize} to {NewSize} (_dockFillSize={DockFillSize})",
+            oldSize,
+            newSize,
+            _dockFillSize
+        );
         InvalidateRebuild();
     }
 
diff --git a/Intersect.Client.Framework/Gwen/Skin/Texturing/Bordered.cs b/Intersect.Client.Framework/Gwen/Skin/Texturing/Bordered.cs
@@ -22,25 +22,27 @@ public partial struct Bordered : IEquatable<Bordered>, IAtlasDrawable
     public static implicit operator FivePatch(Bordered bordered)
     {
         return new FivePatch(
-            bordered.mTexture,
+            bordered._texture,
             (int)bordered.mX,
             (int)bordered.mY,
-            (int)bordered.mWidth,
-            (int)bordered.mHeight,
-            bordered.mMargin,
+            (int)bordered._width,
+            (int)bordered._height,
+            bordered._margin,
             default
         );
     }
 
-    private IGameTexture mTexture;
+    private IGameTexture _texture;
 
-    private readonly SubRect[] mRects;
+    private readonly SubRect[] _subRects;
 
-    private Margin mMargin;
+    private Margin _margin;
 
-    private float mWidth;
+    private float _width;
 
-    private float mHeight;
+    private float _height;
+
+    public Margin Margin => _margin;
 
     public Bordered(
         IGameTexture texture,
@@ -53,10 +55,10 @@ Margin inMargin
     {
         mX = x;
         mY = y;
-        mRects = new SubRect[9];
-        for (var i = 0; i < mRects.Length; i++)
+        _subRects = new SubRect[9];
+        for (var i = 0; i < _subRects.Length; i++)
         {
-            mRects[i].Uv = new float[4];
+            _subRects[i].Uv = new float[4];
         }
 
         Init(texture, x, y, w, h, inMargin);
@@ -65,29 +67,29 @@ Margin inMargin
     void DrawRect(Renderer.Base render, int i, int x, int y, int w, int h, Color clr)
     {
         render.DrawTexturedRect(
-            mTexture, new Rectangle(x, y, w, h), clr, mRects[i].Uv[0], mRects[i].Uv[1], mRects[i].Uv[2],
-            mRects[i].Uv[3]
+            _texture, new Rectangle(x, y, w, h), clr, _subRects[i].Uv[0], _subRects[i].Uv[1], _subRects[i].Uv[2],
+            _subRects[i].Uv[3]
         );
     }
 
     void SetRect(int num, float x, float y, float w, float h)
     {
-        if (mTexture == null)
+        if (_texture == null)
         {
             return;
         }
 
-        float texw = mTexture.Width;
-        float texh = mTexture.Height;
+        float texw = _texture.Width;
+        float texh = _texture.Height;
 
         //x -= 1.0f;
         //y -= 1.0f;
 
-        mRects[num].Uv[0] = x / texw;
-        mRects[num].Uv[1] = y / texh;
+        _subRects[num].Uv[0] = x / texw;
+        _subRects[num].Uv[1] = y / texh;
 
-        mRects[num].Uv[2] = (x + w) / texw;
-        mRects[num].Uv[3] = (y + h) / texh;
+        _subRects[num].Uv[2] = (x + w) / texw;
+        _subRects[num].Uv[3] = (y + h) / texh;
 
         //	rects[num].uv[0] += 1.0f / m_Texture->width;
         //	rects[num].uv[1] += 1.0f / m_Texture->width;
@@ -103,31 +105,31 @@ private void Init(
         float drawMarginScale = 1.0f
     )
     {
-        mTexture = texture;
+        _texture = texture;
 
-        mMargin = inMargin;
+        _margin = inMargin;
 
-        SetRect(0, x, y, mMargin.Left, mMargin.Top);
-        SetRect(1, x + mMargin.Left, y, w - mMargin.Left - mMargin.Right, mMargin.Top);
-        SetRect(2, x + w - mMargin.Right, y, mMargin.Right, mMargin.Top);
+        SetRect(0, x, y, _margin.Left, _margin.Top);
+        SetRect(1, x + _margin.Left, y, w - _margin.Left - _margin.Right, _margin.Top);
+        SetRect(2, x + w - _margin.Right, y, _margin.Right, _margin.Top);
 
-        SetRect(3, x, y + mMargin.Top, mMargin.Left, h - mMargin.Top - mMargin.Bottom);
+        SetRect(3, x, y + _margin.Top, _margin.Left, h - _margin.Top - _margin.Bottom);
         SetRect(
             4,
-            x + mMargin.Left,
-            y + mMargin.Top,
-            w - mMargin.Left - mMargin.Right,
-            h - mMargin.Top - mMargin.Bottom
+            x + _margin.Left,
+            y + _margin.Top,
+            w - _margin.Left - _margin.Right,
+            h - _margin.Top - _margin.Bottom
         );
 
-        SetRect(5, x + w - mMargin.Right, y + mMargin.Top, mMargin.Right, h - mMargin.Top - mMargin.Bottom);
+        SetRect(5, x + w - _margin.Right, y + _margin.Top, _margin.Right, h - _margin.Top - _margin.Bottom);
 
-        SetRect(6, x, y + h - mMargin.Bottom, mMargin.Left, mMargin.Bottom);
-        SetRect(7, x + mMargin.Left, y + h - mMargin.Bottom, w - mMargin.Left - mMargin.Right, mMargin.Bottom);
-        SetRect(8, x + w - mMargin.Right, y + h - mMargin.Bottom, mMargin.Right, mMargin.Bottom);
+        SetRect(6, x, y + h - _margin.Bottom, _margin.Left, _margin.Bottom);
+        SetRect(7, x + _margin.Left, y + h - _margin.Bottom, w - _margin.Left - _margin.Right, _margin.Bottom);
+        SetRect(8, x + w - _margin.Right, y + h - _margin.Bottom, _margin.Right, _margin.Bottom);
 
-        mWidth = w;
-        mHeight = h;
+        _width = w;
+        _height = h;
     }
 
     // can't have this as default param
@@ -138,52 +140,52 @@ private void Init(
 
     public void Draw(Renderer.Base render, Rectangle r, Color col)
     {
-        if (mTexture == null)
+        if (_texture == null)
         {
             return;
         }
 
         render.DrawColor = col;
 
-        if (r.Width < mWidth && r.Height < mHeight)
+        if (r.Width < _width && r.Height < _height)
         {
             render.DrawTexturedRect(
-                mTexture, r, col, mRects[0].Uv[0], mRects[0].Uv[1], mRects[8].Uv[2], mRects[8].Uv[3]
+                _texture, r, col, _subRects[0].Uv[0], _subRects[0].Uv[1], _subRects[8].Uv[2], _subRects[8].Uv[3]
             );
 
             return;
         }
 
-        DrawRect(render, 0, r.X, r.Y, mMargin.Left, mMargin.Top, col);
-        DrawRect(render, 1, r.X + mMargin.Left, r.Y, r.Width - mMargin.Left - mMargin.Right, mMargin.Top, col);
-        DrawRect(render, 2, r.X + r.Width - mMargin.Right, r.Y, mMargin.Right, mMargin.Top, col);
+        DrawRect(render, 0, r.X, r.Y, _margin.Left, _margin.Top, col);
+        DrawRect(render, 1, r.X + _margin.Left, r.Y, r.Width - _margin.Left - _margin.Right, _margin.Top, col);
+        DrawRect(render, 2, r.X + r.Width - _margin.Right, r.Y, _margin.Right, _margin.Top, col);
 
-        DrawRect(render, 3, r.X, r.Y + mMargin.Top, mMargin.Left, r.Height - mMargin.Top - mMargin.Bottom, col);
+        DrawRect(render, 3, r.X, r.Y + _margin.Top, _margin.Left, r.Height - _margin.Top - _margin.Bottom, col);
         DrawRect(
-            render, 4, r.X + mMargin.Left, r.Y + mMargin.Top, r.Width - mMargin.Left - mMargin.Right,
-            r.Height - mMargin.Top - mMargin.Bottom, col
+            render, 4, r.X + _margin.Left, r.Y + _margin.Top, r.Width - _margin.Left - _margin.Right,
+            r.Height - _margin.Top - _margin.Bottom, col
         );
 
         DrawRect(
-            render, 5, r.X + r.Width - mMargin.Right, r.Y + mMargin.Top, mMargin.Right,
-            r.Height - mMargin.Top - mMargin.Bottom, col
+            render, 5, r.X + r.Width - _margin.Right, r.Y + _margin.Top, _margin.Right,
+            r.Height - _margin.Top - _margin.Bottom, col
         );
 
-        DrawRect(render, 6, r.X, r.Y + r.Height - mMargin.Bottom, mMargin.Left, mMargin.Bottom, col);
+        DrawRect(render, 6, r.X, r.Y + r.Height - _margin.Bottom, _margin.Left, _margin.Bottom, col);
         DrawRect(
-            render, 7, r.X + mMargin.Left, r.Y + r.Height - mMargin.Bottom, r.Width - mMargin.Left - mMargin.Right,
-            mMargin.Bottom, col
+            render, 7, r.X + _margin.Left, r.Y + r.Height - _margin.Bottom, r.Width - _margin.Left - _margin.Right,
+            _margin.Bottom, col
         );
 
         DrawRect(
-            render, 8, r.X + r.Width - mMargin.Right, r.Y + r.Height - mMargin.Bottom, mMargin.Right,
-            mMargin.Bottom, col
+            render, 8, r.X + r.Width - _margin.Right, r.Y + r.Height - _margin.Bottom, _margin.Right,
+            _margin.Bottom, col
         );
     }
 
     public bool Equals(Bordered other)
     {
-        return mTexture.Equals(other.mTexture) && mRects.Equals(other.mRects) && mMargin.Equals(other.mMargin) && mWidth.Equals(other.mWidth) && mHeight.Equals(other.mHeight);
+        return _texture.Equals(other._texture) && _subRects.Equals(other._subRects) && _margin.Equals(other._margin) && _width.Equals(other._width) && _height.Equals(other._height);
     }
 
     public override bool Equals(object? obj)
@@ -193,7 +195,7 @@ public override bool Equals(object? obj)
 
     public override int GetHashCode()
     {
-        return HashCode.Combine(mTexture, mRects, mMargin, mWidth, mHeight);
+        return HashCode.Combine(_texture, _subRects, _margin, _width, _height);
     }
 
     public static bool operator ==(Bordered lhs, Bordered rhs) => lhs.Equals(rhs);

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,14 @@ public SpriteFont Instance`
`43`	`43`	`{`
`44`	`44`	`try`
`45`	`45`	`{`
`46`		`- return _instance ??= PlatformObjectFactory();`
	`46`	`+ // ReSharper disable once InvertIf`
	`47`	`+ if (_instance == null)`
	`48`	`+ {`
	`49`	`+ _instance = PlatformObjectFactory();`
	`50`	`+ _instance.Texture.Name = $"{FontName} @ {Size}pt";`
	`51`	`+ }`
	`52`	`+`
	`53`	`+ return _instance;`
`47`	`54`	`}`
`48`	`55`	`catch (Exception exception)`
`49`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1008,8 +1008,13 @@ public override GameShader LoadShader(string shaderName)`
`1008`	`1008`	`return new Shader(this, shaderName, _contentManager);`
`1009`	`1009`	`}`
`1010`	`1010`
`1011`		`- public override System.Numerics.Vector2 MeasureText(string text, IFont? font, int size, float fontScale)`
	`1011`	`+ public override System.Numerics.Vector2 MeasureText(string? text, IFont? font, int size, float fontScale)`
`1012`	`1012`	`{`
	`1013`	`+ if (string.IsNullOrWhiteSpace(text))`
	`1014`	`+ {`
	`1015`	`+ return default;`
	`1016`	`+ }`
	`1017`	`+`
`1013`	`1018`	`if (font is not Font<SpriteFont> platformFont)`
`1014`	`1019`	`{`
`1015`	`1020`	`return default;`
Original file line number	Diff line number	Diff line change
`@@ -494,6 +494,7 @@ bool noSplit`
`494`	`494`	`Alignment = [block.Alignment],`
`495`	`495`	`AutoSizeToContents = true,`
`496`	`496`	`Font = font,`
	`497`	`+ FontSize = block.FontSize,`
`497`	`498`	`RestrictToParent = false,`
`498`	`499`	`Text = x == 0 ? text.TrimStart(' ') : text,`
`499`	`500`	`TextAlign = Pos.None,`
`@@ -583,6 +584,12 @@ protected override void OnSizeChanged(Point oldSize, Point newSize)`
`583`	`584`	`}`
`584`	`585`	`}`
`585`	`586`
	`587`	`+ ApplicationContext.CurrentContext.Logger.LogDebug(`
	`588`	`+ "Rebuilding due to size change from {OldSize} to {NewSize} (_dockFillSize={DockFillSize})",`
	`589`	`+ oldSize,`
	`590`	`+ newSize,`
	`591`	`+ _dockFillSize`
	`592`	`+ );`
`586`	`593`	`InvalidateRebuild();`
`587`	`594`	`}`
`588`	`595`