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

fixed line splitting with the new formatting

Browse source
This commit is contained in:
Ellpeck 2020-05-15 13:16:03 +02:00
parent 8398499edd
commit d28239291c
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
MLEM/Formatting/TokenizedString.cs
View file

@ -1,5 +1,6 @@
using System; using System;
using System.Linq; using System.Linq;
using System.Text;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using MLEM.Font; using MLEM.Font;
@ -18,11 +19,27 @@ namespace MLEM.Formatting {
} }
public void Split(GenericFont font, float width, float scale) { public void Split(GenericFont font, float width, float scale) {
// a split string has the same character count as the input string
// but with newline characters added
var split = font.SplitString(this.String, width, scale); var split = font.SplitString(this.String, width, scale);
// remove spaces at the end of new lines since we want the same character count foreach (var token in this.Tokens) {
split = split.Replace(" \n", "\n"); var index = 0;
foreach (var token in this.Tokens) var length = 0;
token.Substring = split.Substring(token.Index, token.Substring.Length); var ret = new StringBuilder();
// this is basically a substring function that ignores newlines for indexing
for (var i = 0; i < split.Length; i++) {
// if we're within the bounds of the token's substring, append to the new substring
if (index >= token.Index && length < token.Substring.Length)
ret.Append(split[i]);
// if the current char is not a newline, we simulate length increase
if (split[i] != '\n') {
if (index >= token.Index)
length++;
index++;
}
}
token.Substring = ret.ToString();
}
} }
public void Draw(GameTime time, SpriteBatch batch, Vector2 pos, GenericFont font, Color color, float scale, float depth) { public void Draw(GameTime time, SpriteBatch batch, Vector2 pos, GenericFont font, Color color, float scale, float depth) {

2
Sandbox/GameImpl.cs
View file

@ -113,7 +113,7 @@ namespace Sandbox {
};*/ };*/
var formatter = new TextFormatter(); var formatter = new TextFormatter();
var strg = "This <c CornflowerBlue>is a formatted string</c> with <c #ff0000>two bits of formatting</c>!"; var strg = "This <c CornflowerBlue>is a formatted string</c> with <c #ff0000>two bits of formatting</c>! It also includesavery<c Pink>long</c>wordthatis<c Blue>formatted</c>aswell.";
this.tokenized = formatter.Tokenize(strg); this.tokenized = formatter.Tokenize(strg);
this.tokenized.Split(font, 400, 1); this.tokenized.Split(font, 400, 1);