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

GRAPHICS: More work on rich text formatting

Browse source
This commit is contained in:
Eugene Sandulenko 2017-01-30 22:58:02 +01:00
parent 93e35cb9d7
commit 119e1bd30d
2 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
graphics/macgui/mactext.cpp
View file

@ -56,6 +56,8 @@ MacText::MacText(Common::String s, MacWindowManager *wm, const Font *font, int f
_defaultFormatting.font = font;
_defaultFormatting.wm = wm;
_currentFormatting = _defaultFormatting;
}
void MacText::splitString(Common::String &str) {
@ -64,6 +66,8 @@ void MacText::splitString(Common::String &str) {
Common::String tmp;
bool prevCR = false;
int curLine = _text.empty() ? 0 : _text.size() - 1;
while (*s) {
if (*s == '\001') {
s++;
@ -84,6 +88,13 @@ void MacText::splitString(Common::String &str) {
debug(8, "******** splitString: fontId: %d, textSlant: %d, unk3: %d, fontSize: %d, p0: %x p1: %x p2: %x",
fontId, textSlant, unk3f, fontSize, palinfo1, palinfo2, palinfo3);
_currentFormatting.setValues(_wm, fontId, textSlant, unk3f, fontSize, palinfo1, palinfo2, palinfo3);
if (_formatting.empty())
_formatting.resize(1);
_formatting[curLine].push_back(_currentFormatting);
continue;
}
}