libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-25 20:15:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRAPHICS: Simplify MacText

Browse Source
This commit is contained in:
Eugene Sandulenko 2016-12-20 21:19:13 +01:00
parent 2d6c582805
commit 88b9dd3472
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
graphics/macgui/mactext.cpp
View File

@ -70,7 +70,7 @@ void MacText::splitString(Common::String &str) {
tmp += *s;
}
if (_text.size())
if (tmp.size())
_maxWidth = MIN(_font->wordWrapText(tmp, _maxWidth, _text), _maxWidth);
}
@ -98,10 +98,6 @@ void MacText::reallocSurface() {
void MacText::render() {
if (_fullRefresh) {
reallocSurface();
_surface->clear(_bgcolor);
render(0, _text.size());
_fullRefresh = false;
@ -109,6 +105,8 @@ void MacText::render() {
}
void MacText::render(int from, int to) {
reallocSurface();
from = MAX<int>(0, from);
to = MIN<int>(to, _text.size());
@ -133,8 +131,9 @@ void MacText::draw(ManagedSurface *g, int x, int y, int w, int h, int xoff, int
g->fillRect(Common::Rect(x, y, x + w, y + w), _bgcolor);
}
g->blitFrom(*_surface, Common::Rect(MIN<int>(_surface->w, x), MIN<int>(_surface->h, y),
MIN<int>(_surface->w, x + w), MIN<int>(_surface->w, y + w)), Common::Point(xoff, yoff));
g->blitFrom(*_surface, Common::Rect(MIN<int>(_surface->w, x), MIN<int>(_surface->h, y),
MIN<int>(_surface->w, x + w), MIN<int>(_surface->w, y + w)),
Common::Point(xoff, yoff));
}
void MacText::appendText(Common::String str) {
@ -142,8 +141,6 @@ void MacText::appendText(Common::String str) {
splitString(str);
reallocSurface();
render(oldLen + 1, _text.size());
}