diff options
author | Eugene Sandulenko | 2017-08-02 21:46:25 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2017-08-04 21:54:19 +0200 |
commit | 4e044d7bd3272e95a95feefb407bb2b1ffba23c8 (patch) | |
tree | 6a8f1f663186fbb770a80f0e5119414c1e07cffc /graphics/macgui/mactext.cpp | |
parent | 59d6b63b0f63949717e9621578b97c58c1d09ce6 (diff) | |
download | scummvm-rg350-4e044d7bd3272e95a95feefb407bb2b1ffba23c8.tar.gz scummvm-rg350-4e044d7bd3272e95a95feefb407bb2b1ffba23c8.tar.bz2 scummvm-rg350-4e044d7bd3272e95a95feefb407bb2b1ffba23c8.zip |
GRAPHICS: MACGUI: Do not add input line to the original MacText content
During resize we were replaying all MacText appends, which was including
whole history of the input. Eek.
Diffstat (limited to 'graphics/macgui/mactext.cpp')
-rw-r--r-- | graphics/macgui/mactext.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp index 925f21beac..7fd129f968 100644 --- a/graphics/macgui/mactext.cpp +++ b/graphics/macgui/mactext.cpp @@ -378,15 +378,17 @@ uint getNewlinesInString(const Common::String &str) { return newLines; } -void MacText::appendText(Common::String str, int fontId = kMacFontChicago, int fontSize = 12, int fontSlant = kMacFontRegular) { +void MacText::appendText(Common::String str, int fontId, int fontSize, int fontSlant, bool skipAdd) { uint oldLen = _textLines.size(); MacFontRun fontRun = MacFontRun(_wm, fontId, fontSlant, fontSize, 0, 0, 0); _currentFormatting = fontRun; - _str += fontRun.toString(); - _str += str; + if (!skipAdd) { + _str += fontRun.toString(); + _str += str; + } splitString(str); recalcDims(); @@ -394,13 +396,15 @@ void MacText::appendText(Common::String str, int fontId = kMacFontChicago, int f render(oldLen - 1, _textLines.size()); } -void MacText::appendTextDefault(Common::String str) { +void MacText::appendTextDefault(Common::String str, bool skipAdd) { uint oldLen = _textLines.size(); _currentFormatting = _defaultFormatting; - _str += _defaultFormatting.toString(); - _str += str; + if (!skipAdd) { + _str += _defaultFormatting.toString(); + _str += str; + } splitString(str); recalcDims(); |