qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-26 02:08:28 +02:00
Code

Made multi-line text drawing more efficient

Browse Source 
Instead of splitting everything at once, split off one line at a time.
The code could be more compact but I want to avoid using substr on the
very common special case when a string contains no newlines.
This commit is contained in:
Maarten ter Huurne 2014-07-18 05:03:57 +02:00
parent 5c7ca19f4b
commit 2effd1fc99
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/font.cpp
View File

@ -66,17 +66,19 @@ void Font::write(Surface *surface, const string &text,
return; return;
} }
if (text.find("\n", 0) == string::npos) { size_t pos = text.find('\n', 0);
if (pos == string::npos) {
writeLine(surface, text, x, y, halign, valign); writeLine(surface, text, x, y, halign, valign);
return; } else {
} size_t prev = 0;
do {
vector<string> v; writeLine(surface, text.substr(prev, pos - prev),
split(v, text, "\n"); x, y, halign, valign);
for (vector<string>::const_iterator it = v.begin(); it != v.end(); it++) {
writeLine(surface, *it, x, y, halign, valign);
y += lineSpacing; y += lineSpacing;
prev = pos + 1;
pos = text.find('\n', prev);
} while (pos != string::npos);
writeLine(surface, text.substr(prev), x, y, halign, valign);
} }
} }