Ellpeck/MLEM
1
0
Fork 0
mirror of https://github.com/Ellpeck/MLEM.git synced 2024-11-22 20:58:34 +01:00
Code Issues Projects Releases Wiki Activity

finally center it

Browse source
This commit is contained in:
Ellpeck 2019-08-15 16:29:41 +02:00
parent 481074bcc3
commit b42ec52017
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MLEM.Extended/Extensions/BitmapFontExtensions.cs
View file

@ -12,11 +12,11 @@ namespace MLEM.Extended.Extensions {
builder.Append(word).Append(' '); builder.Append(word).Append(' ');
if (font.MeasureString(builder).Width * scale >= width) { if (font.MeasureString(builder).Width * scale >= width) {
var len = builder.Length - word.Length - 1; var len = builder.Length - word.Length - 1;
yield return builder.ToString(0, len); yield return builder.ToString(0, len - 1);
builder.Remove(0, len); builder.Remove(0, len);
} }
} }
yield return builder.ToString(); yield return builder.ToString(0, builder.Length - 1);
} }
} }

10
MLEM.Ui/Elements/Paragraph.cs
View file

@ -44,16 +44,14 @@ namespace MLEM.Ui.Elements {
this.lineHeight = 0; this.lineHeight = 0;
this.longestLineLength = 0; this.longestLineLength = 0;
var height = 0F;
foreach (var strg in this.splitText) { foreach (var strg in this.splitText) {
var strgScale = this.font.MeasureString(strg) * this.TextScale * this.Scale; var strgScale = this.font.MeasureString(strg) * this.TextScale * this.Scale;
height += strgScale.Y + 1; if (strgScale.Y + 1 > this.lineHeight)
if (strgScale.Y > this.lineHeight) this.lineHeight = strgScale.Y + 1;
this.lineHeight = strgScale.Y;
if (strgScale.X > this.longestLineLength) if (strgScale.X > this.longestLineLength)
this.longestLineLength = strgScale.X; 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) { public override void Draw(GameTime time, SpriteBatch batch, float alpha, Point offset) {
@ -68,7 +66,7 @@ namespace MLEM.Ui.Elements {
} else { } else {
this.font.DrawString(batch, line, pos + off, this.TextColor * alpha, 0, Vector2.Zero, this.TextScale * this.Scale, SpriteEffects.None, 0); 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); base.Draw(time, batch, alpha, offset);
} }

4
MLEM/Extensions/SpriteFontExtensions.cs
View file

@ -11,11 +11,11 @@ namespace MLEM.Extensions {
builder.Append(word).Append(' '); builder.Append(word).Append(' ');
if (font.MeasureString(builder).X * scale >= width) { if (font.MeasureString(builder).X * scale >= width) {
var len = builder.Length - word.Length - 1; var len = builder.Length - word.Length - 1;
yield return builder.ToString(0, len); yield return builder.ToString(0, len - 1);
builder.Remove(0, len); builder.Remove(0, len);
} }
} }
yield return builder.ToString(); yield return builder.ToString(0, builder.Length - 1);
} }
} }