vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(daabbddf0) Fixed ToolBox.WrapText stripping out extra spaces from the text, causing caret positioning not working correctly if the text contains multiple successive spaces

Browse Source
This commit is contained in:
Joonas Rikkonen
2019-04-08 11:44:49 +03:00
parent 904a1dabb0
commit 9aea0fa7af
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/Source/Utils/ToolBox.cs
+12 -6
View File
@@ -108,12 +108,19 @@ namespace Barotrauma
StringBuilder wrappedText = new StringBuilder(); StringBuilder wrappedText = new StringBuilder();
float linePos = 0f; float linePos = 0f;
float spaceWidth = font.MeasureString(" ").X * textScale; Vector2 spaceSize = font.MeasureString(" ") * textScale;
for (int i = 0; i < words.Length; ++i) for (int i = 0; i < words.Length; ++i)
{ {
if (string.IsNullOrWhiteSpace(words[i]) && words[i] != "\n") continue; if (words[i].Length == 0)
{
//space
}
else if (string.IsNullOrWhiteSpace(words[i]) && words[i] != "\n")
{
continue;
}
Vector2 size = font.MeasureString(words[i]) * textScale; Vector2 size = words[i].Length == 0 ? spaceSize : font.MeasureString(words[i]) * textScale;
if (size.X > lineLength) if (size.X > lineLength)
{ {
if (linePos == 0.0f) if (linePos == 0.0f)
@@ -149,8 +156,7 @@ namespace Barotrauma
} }
else else
{ {
linePos += size.X + spaceSize.X;
linePos += size.X + spaceWidth;
} }
} }
else else
@@ -158,7 +164,7 @@ namespace Barotrauma
wrappedText.Append("\n"); wrappedText.Append("\n");
wrappedText.Append(words[i]); wrappedText.Append(words[i]);
linePos = size.X + spaceWidth; linePos = size.X + spaceSize.X;
} }
if (i < words.Length - 1) wrappedText.Append(" "); if (i < words.Length - 1) wrappedText.Append(" ");