From b42ec52017a972718ff88a2385ed29641d2d3046 Mon Sep 17 00:00:00 2001
From: Ellpeck <megamaximal@gmail.com>
Date: Thu, 15 Aug 2019 16:29:41 +0200
Subject: [PATCH] finally center it

---
 MLEM.Extended/Extensions/BitmapFontExtensions.cs |  4 ++--
 MLEM.Ui/Elements/Paragraph.cs                    | 10 ++++------
 MLEM/Extensions/SpriteFontExtensions.cs          |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/MLEM.Extended/Extensions/BitmapFontExtensions.cs b/MLEM.Extended/Extensions/BitmapFontExtensions.cs
index bd4ee49..9bd9cbb 100644
--- a/MLEM.Extended/Extensions/BitmapFontExtensions.cs
+++ b/MLEM.Extended/Extensions/BitmapFontExtensions.cs
@@ -12,11 +12,11 @@ namespace MLEM.Extended.Extensions {
                 builder.Append(word).Append(' ');
                 if (font.MeasureString(builder).Width * scale >= width) {
                     var len = builder.Length - word.Length - 1;
-                    yield return builder.ToString(0, len);
+                    yield return builder.ToString(0, len - 1);
                     builder.Remove(0, len);
                 }
             }
-            yield return builder.ToString();
+            yield return builder.ToString(0, builder.Length - 1);
         }
 
     }
diff --git a/MLEM.Ui/Elements/Paragraph.cs b/MLEM.Ui/Elements/Paragraph.cs
index 576f88f..cd96d69 100644
--- a/MLEM.Ui/Elements/Paragraph.cs
+++ b/MLEM.Ui/Elements/Paragraph.cs
@@ -44,16 +44,14 @@ namespace MLEM.Ui.Elements {
 
             this.lineHeight = 0;
             this.longestLineLength = 0;
-            var height = 0F;
             foreach (var strg in this.splitText) {
                 var strgScale = this.font.MeasureString(strg) * this.TextScale * this.Scale;
-                height += strgScale.Y + 1;
-                if (strgScale.Y > this.lineHeight)
-                    this.lineHeight = strgScale.Y;
+                if (strgScale.Y + 1 > this.lineHeight)
+                    this.lineHeight = strgScale.Y + 1;
                 if (strgScale.X > this.longestLineLength)
                     this.longestLineLength = strgScale.X;
             }
-            return new Point(this.AutoAdjustWidth ? (this.longestLineLength + this.ScaledPadding.X * 2).Ceil() : size.X, height.Ceil() + this.ScaledPadding.Y * 2);
+            return new Point(this.AutoAdjustWidth ? this.longestLineLength.Ceil() + this.ScaledPadding.X * 2 : size.X, (this.lineHeight * this.splitText.Length).Ceil() + this.ScaledPadding.Y * 2);
         }
 
         public override void Draw(GameTime time, SpriteBatch batch, float alpha, Point offset) {
@@ -68,7 +66,7 @@ namespace MLEM.Ui.Elements {
                 } else {
                     this.font.DrawString(batch, line, pos + off, this.TextColor * alpha, 0, Vector2.Zero, this.TextScale * this.Scale, SpriteEffects.None, 0);
                 }
-                off.Y += this.lineHeight + 1;
+                off.Y += this.lineHeight;
             }
             base.Draw(time, batch, alpha, offset);
         }
diff --git a/MLEM/Extensions/SpriteFontExtensions.cs b/MLEM/Extensions/SpriteFontExtensions.cs
index b5afbb4..fb4f0ef 100644
--- a/MLEM/Extensions/SpriteFontExtensions.cs
+++ b/MLEM/Extensions/SpriteFontExtensions.cs
@@ -11,11 +11,11 @@ namespace MLEM.Extensions {
                 builder.Append(word).Append(' ');
                 if (font.MeasureString(builder).X * scale >= width) {
                     var len = builder.Length - word.Length - 1;
-                    yield return builder.ToString(0, len);
+                    yield return builder.ToString(0, len - 1);
                     builder.Remove(0, len);
                 }
             }
-            yield return builder.ToString();
+            yield return builder.ToString(0, builder.Length - 1);
         }
 
     }