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

Improve WidgetUtils.WrapText performance on long lines.

Browse Source
This commit is contained in:
Paul Chote
2017-10-12 17:44:33 +00:00
committed by reaperrr
parent 88c94ee841
commit 77a7453347
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,29 +203,29 @@ namespace OpenRA.Widgets
for (var i = 0; i < lines.Count; i++)
{
var line = lines[i];
var m = font.Measure(line);
if (m.X <= width)
if (font.Measure(line).X <= width)
continue;
var bestSpaceIndex = -1;
var start = line.Length - 1;
while (m.X > width)
// Scan forwards until we find the last word that fits
// This guarantees a small bound on the amount of string we need to search before a linebreak
var start = 0;
while (true)
{
var spaceIndex = line.LastIndexOf(' ', start);
var spaceIndex = line.IndexOf(' ', start);
if (spaceIndex == -1)
break;
bestSpaceIndex = spaceIndex;
start = spaceIndex - 1;
m = font.Measure(line.Substring(0, spaceIndex));
var fragmentWidth = font.Measure(line.Substring(0, spaceIndex)).X;
if (fragmentWidth > width)
break;
start = spaceIndex + 1;
}
if (bestSpaceIndex != -1)
if (start > 0)
{
lines[i] = line.Substring(0, bestSpaceIndex);
lines.Insert(i + 1, line.Substring(bestSpaceIndex + 1));
lines[i] = line.Substring(0, start - 1);
lines.Insert(i + 1, line.Substring(start));
}
}