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

GRAPHICS: Store more metainformation on lines in MacText

Browse source
This commit is contained in:
Eugene Sandulenko 2017-01-31 22:35:06 +01:00
parent 93265c6d41
commit c15e063bbd
2 changed files with 26 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
graphics/macgui/mactext.cpp
View file

@ -68,11 +68,11 @@ void MacText::splitString(Common::String &str) {
if (_textLines.empty()) { if (_textLines.empty()) {
_textLines.resize(1); _textLines.resize(1);
_textLines[0].push_back(_defaultFormatting); _textLines[0].chunks.push_back(_defaultFormatting);
} }
int curLine = _textLines.size() - 1; int curLine = _textLines.size() - 1;
int curChunk = _textLines[curLine].size() - 1; int curChunk = _textLines[curLine].chunks.size() - 1;
bool nextChunk = false; bool nextChunk = false;
while (*s) { while (*s) {
@ -97,11 +97,11 @@ 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])[curChunk].text.empty()) { if (_textLines[curLine].chunks[curChunk].text.empty()) {
(_textLines[curLine])[curChunk] = _currentFormatting; _textLines[curLine].chunks[curChunk] = _currentFormatting;
continue; continue;
} else { } else {
_textLines[curLine].push_back(_currentFormatting); _textLines[curLine].chunks.push_back(_currentFormatting);
} }
nextChunk = true; nextChunk = true;
@ -123,7 +123,7 @@ void MacText::splitString(Common::String &str) {
if (text.size()) { if (text.size()) {
if (nextChunk) { if (nextChunk) {
(_textLines[curLine])[curChunk].text += text[0]; _textLines[curLine].chunks[curChunk].text += text[0];
curChunk++; curChunk++;
_text[curLine] += text[0]; _text[curLine] += text[0];
@ -136,16 +136,16 @@ void MacText::splitString(Common::String &str) {
for (uint i = 0; i < text.size(); i++) { for (uint i = 0; i < text.size(); i++) {
_text.push_back(text[i]); _text.push_back(text[i]);
(_textLines[curLine])[curChunk].text = text[i]; _textLines[curLine].chunks[curChunk].text = text[i];
curLine++; curLine++;
_textLines.resize(curLine + 1); _textLines.resize(curLine + 1);
_textLines[curLine].push_back(_currentFormatting); _textLines[curLine].chunks.push_back(_currentFormatting);
curChunk = 0; curChunk = 0;
} }
} else { } else {
if (nextChunk) { // No text, replacing formatting if (nextChunk) { // No text, replacing formatting
(_textLines[curLine])[curChunk] = _currentFormatting; _textLines[curLine].chunks[curChunk] = _currentFormatting;
} }
} }
@ -165,7 +165,7 @@ void MacText::splitString(Common::String &str) {
_textMaxWidth = MAX(_font->wordWrapText(tmp, _maxWidth, text), _textMaxWidth); _textMaxWidth = MAX(_font->wordWrapText(tmp, _maxWidth, text), _textMaxWidth);
(_textLines[curLine])[curChunk].text = text[0]; _textLines[curLine].chunks[curChunk].text = text[0];
_text.push_back(text[0]); _text.push_back(text[0]);
@ -175,8 +175,8 @@ void MacText::splitString(Common::String &str) {
curLine++; curLine++;
_textLines.resize(curLine + 1); _textLines.resize(curLine + 1);
_textLines[curLine].push_back(_currentFormatting); _textLines[curLine].chunks.push_back(_currentFormatting);
(_textLines[curLine])[0].text = text[i]; _textLines[curLine].chunks[0].text = text[i];
} }
} }
} }
@ -242,8 +242,8 @@ void MacText::render(int from, int to) {
for (uint i = 0; i < _textLines.size(); i++) { for (uint i = 0; i < _textLines.size(); i++) {
debugN(4, "%2d ", i); debugN(4, "%2d ", i);
for (uint j = 0; j < _textLines[i].size(); j++) for (uint j = 0; j < _textLines[i].chunks.size(); j++)
debugN(4, "[%d] \"%s\"", (_textLines[i])[j].fontId, (_textLines[i])[j].text.c_str()); debugN(4, "[%d] \"%s\"", _textLines[i].chunks[j].fontId, _textLines[i].chunks[j].text.c_str());
debug(4, ""); debug(4, "");
} }

13
graphics/macgui/mactext.h
View file

@ -73,6 +73,17 @@ struct MacFontRun {
const Font *getFont(); const Font *getFont();
}; };
struct MacTextLine {
int width;
int height;
Common::Array<MacFontRun> chunks;
MacTextLine() {
width = height = -1;
}
};
class MacText { class MacText {
public: public:
MacText(Common::String s, MacWindowManager *wm, const Graphics::Font *font, int fgcolor, int bgcolor, MacText(Common::String s, MacWindowManager *wm, const Graphics::Font *font, int fgcolor, int bgcolor,
@ -112,7 +123,7 @@ private:
TextAlign _textAlignment; TextAlign _textAlignment;
Common::Array< Common::Array<MacFontRun> > _textLines; Common::Array<MacTextLine> _textLines;
MacFontRun _defaultFormatting; MacFontRun _defaultFormatting;
MacFontRun _currentFormatting; MacFontRun _currentFormatting;
}; };