[Scummvm-git-logs] scummvm master -> c30df011309f4028bcd38daeab8d968c69b16ad9
sev-
sev at scummvm.org
Thu Feb 2 10:09:11 CET 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
c30df01130 GRAPHICS: More optimization for empty strings
Commit: c30df011309f4028bcd38daeab8d968c69b16ad9
https://github.com/scummvm/scummvm/commit/c30df011309f4028bcd38daeab8d968c69b16ad9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-02T10:11:07+01:00
Commit Message:
GRAPHICS: More optimization for empty strings
Changed paths:
graphics/macgui/mactext.cpp
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index 0201b19..895d49e 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -277,7 +277,9 @@ int MacText::getLineWidth(int line, bool enforce) {
int height = 0;
for (uint i = 0; i < _textLines[line].chunks.size(); i++) {
- width += _textLines[line].chunks[i].getFont()->getStringWidth(_textLines[line].chunks[i].text);
+ if (!_textLines[line].chunks[i].text.empty())
+ width += _textLines[line].chunks[i].getFont()->getStringWidth(_textLines[line].chunks[i].text);
+
height = MAX(height, _textLines[line].chunks[i].getFont()->getFontHeight());
}
More information about the Scummvm-git-logs
mailing list