diff options
| author | craigsc | 2020-01-11 12:08:21 -0800 |
|---|---|---|
| committer | craigsc | 2020-01-11 12:08:21 -0800 |
| commit | 3dd4fb16f017a8eab5c6c11fd119a397b457866e (patch) | |
| tree | 5b80b5c5038d8577c2d674a5a4742b335deca515 /graphics/macgui/mactext.cpp | |
| parent | f9f81ea9baecb714f26cf1c17a1b0ae58431467b (diff) | |
| parent | 5893672b80f00fced33c42e63471d68ba47d7dd4 (diff) | |
| download | scummvm-rg350-3dd4fb16f017a8eab5c6c11fd119a397b457866e.tar.gz scummvm-rg350-3dd4fb16f017a8eab5c6c11fd119a397b457866e.tar.bz2 scummvm-rg350-3dd4fb16f017a8eab5c6c11fd119a397b457866e.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'graphics/macgui/mactext.cpp')
| -rw-r--r-- | graphics/macgui/mactext.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp index 0df403ac8c..2fc9b8dd33 100644 --- a/graphics/macgui/mactext.cpp +++ b/graphics/macgui/mactext.cpp @@ -69,8 +69,7 @@ MacText::MacText(Common::U32String s, MacWindowManager *wm, const MacFont *macFo _currentFormatting = _defaultFormatting; - if (!_str.empty()) - splitString(_str); + splitString(_str); recalcDims(); @@ -101,8 +100,7 @@ MacText::MacText(const Common::String &s, MacWindowManager *wm, const MacFont *m _currentFormatting = _defaultFormatting; - if (!_str.empty()) - splitString(_str); + splitString(_str); recalcDims(); @@ -114,13 +112,11 @@ void MacText::setMaxWidth(int maxWidth) { _textLines.clear(); - if (!_str.empty()) { - splitString(_str); + splitString(_str); - recalcDims(); + recalcDims(); - _fullRefresh = true; - } + _fullRefresh = true; } static const Common::U32String::value_type *readHex(uint16 *res, const Common::U32String::value_type *s, int len) { @@ -395,7 +391,7 @@ int MacText::getLineWidth(int line, bool enforce) { height = MAX(height, _textLines[line].chunks[i].getFont()->getFontHeight()); } - if (!hastext) + if (!hastext && _textLines.size() > 1) height = height > 3 ? height - 3 : 0; _textLines[line].width = width; |