thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

GRAPHICS: MacText fixes for in-the middle style change splitting

Browse source
This commit is contained in:
Eugene Sandulenko 2017-02-01 18:58:35 +01:00
parent 6fbb82f85b
commit 6e3e8911c1
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
graphics/macgui/mactext.cpp
View file

@ -109,9 +109,8 @@ void MacText::splitString(Common::String &str) {
_currentFormatting.setValues(_wm, fontId, textSlant, unk3f, fontSize, palinfo1, palinfo2, palinfo3); _currentFormatting.setValues(_wm, fontId, textSlant, unk3f, fontSize, palinfo1, palinfo2, palinfo3);
if (_textLines[curLine].chunks[curChunk].text.empty()) { if (curLine == 0 && curChunk == 0 && _textLines[curLine].chunks[curChunk].text.empty()) {
_textLines[curLine].chunks[curChunk] = _currentFormatting; _textLines[curLine].chunks[curChunk] = _currentFormatting;
continue;
} else { } else {
_textLines[curLine].chunks.push_back(_currentFormatting); _textLines[curLine].chunks.push_back(_currentFormatting);
} }
@ -138,7 +137,12 @@ void MacText::splitString(Common::String &str) {
_textLines[curLine].chunks[curChunk].text += text[0]; _textLines[curLine].chunks[curChunk].text += text[0];
curChunk++; curChunk++;
_text[curLine] += text[0]; _textLines[curLine].chunks.push_back(_currentFormatting);
if (_text.size() == curLine)
_text.push_back(text[0]);
else
_text[curLine] += text[0];
nextChunk = false; nextChunk = false;
@ -156,7 +160,7 @@ void MacText::splitString(Common::String &str) {
curChunk = 0; curChunk = 0;
} }
} else { } else {
if (nextChunk) { // No text, replacing formatting if (nextChunk && 0) { // No text, replacing formatting
_textLines[curLine].chunks[curChunk] = _currentFormatting; _textLines[curLine].chunks[curChunk] = _currentFormatting;
} }
} }