epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix text-wrapping special case

Browse Source 
If a line of text contained a whole word that was longer than the
allotted space, it would fail to wrap that line completely, even
if it was possible to wrap at other locations.

Fixing this uncovered a second issue, where it would drop the last
line if the input had more than one lines and one of the first ones
was wider than the specified width.
This commit is contained in:
Pavlos Touboulidis
2014-04-25 18:11:44 +03:00
parent 4f12882706
commit ef066560ad
2 changed files with 17 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Exts.cs
View File

@@ -149,7 +149,7 @@ namespace OpenRA
public static string JoinWith<T>(this IEnumerable<T> ts, string j)
{
return string.Join(j, ts.Select(t => t.ToString()).ToArray());
return string.Join(j, ts);
}
public static IEnumerable<T> Append<T>(this IEnumerable<T> ts, params T[] moreTs)

46
OpenRA.Game/Widgets/WidgetUtils.cs
View File

@@ -170,52 +170,38 @@ namespace OpenRA.Widgets
var textSize = font.Measure(text);
if (textSize.X > width)
{
var lines = text.Split('\n');
var newLines = new List<string>();
var i = 0;
var line = lines[i++];
var lines = text.Split('\n').ToList();
for(;;)
for (int i=0; i<lines.Count; i++)
{
newLines.Add(line);
var line = lines[i];
var m = font.Measure(line);
var spaceIndex = 0;
var start = line.Length - 1;
if (m.X <= width)
{
if (i < lines.Length - 1)
{
line = lines[i++];
continue;
}
else
break;
}
continue;
var bestSpaceIndex = -1;
var start = line.Length - 1;
while (m.X > width)
{
if (-1 == (spaceIndex = line.LastIndexOf(' ', start)))
int spaceIndex = line.LastIndexOf(' ', start);
if (spaceIndex == -1)
break;
bestSpaceIndex = spaceIndex;
start = spaceIndex - 1;
m = font.Measure(line.Substring(0, spaceIndex));
}
if (spaceIndex != -1)
if (bestSpaceIndex != -1)
{
newLines.RemoveAt(newLines.Count - 1);
newLines.Add(line.Substring(0, spaceIndex));
line = line.Substring(spaceIndex + 1);
lines[i] = line.Substring(0, bestSpaceIndex);
lines.Insert(i + 1, line.Substring(bestSpaceIndex + 1));
}
else if (i < lines.Length - 1)
{
line = lines[i++];
continue;
}
else
break;
}
return newLines.JoinWith("\n");
return string.Join("\n", lines);
}
return text;
}