ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

STARK: Use the appropriate font height when rendering text

Browse Source
This commit is contained in:
Bastien Bouclet
2016-01-01 07:30:08 +01:00
parent 4ab0d76488
commit a4ae3939d9
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engines/stark/visual/text.cpp
+14 -10
View File
@@ -41,7 +41,8 @@ VisualText::VisualText(Gfx::Driver *gfx) :
_color(0),
_backgroundColor(0),
_targetWidth(600),
_font(nullptr) {
_fontCustomIndex(-1),
_fontType(FontProvider::kBigFont) {
}
VisualText::~VisualText() {
@@ -76,16 +77,23 @@ void VisualText::setTargetWidth(uint32 width) {
_targetWidth = width;
}
void VisualText::setFont(FontProvider::FontType type, int32 customFontIndex) {
freeTexture();
_fontType = type;
_fontCustomIndex = customFontIndex;
}
void VisualText::createTexture() {
assert(_font);
const Graphics::Font *font = StarkFontProvider->getFont(_fontType, _fontCustomIndex);
int height = StarkFontProvider->getFontHeight(_fontType, _fontCustomIndex);
Common::Array<Common::String> lines;
_font->wordWrapText(_text, _targetWidth, lines);
font->wordWrapText(_text, _targetWidth, lines);
int height = _font->getFontHeight() + 1;
int width = 0;
for (uint i = 0; i < lines.size(); i++) {
width = MAX(width, _font->getStringWidth(lines[i]));
width = MAX(width, font->getStringWidth(lines[i]));
}
Common::Rect boundingRect = Common::Rect(width, height * lines.size());
@@ -95,7 +103,7 @@ void VisualText::createTexture() {
surface.fillRect(boundingRect, _backgroundColor);
for (uint i = 0; i < lines.size(); i++) {
_font->drawString(&surface, lines[i], 0, height * i, _targetWidth, _color);
font->drawString(&surface, lines[i], 0, height * i, _targetWidth, _color);
}
_texture = _gfx->createTexture(&surface);
surface.free();
@@ -114,8 +122,4 @@ void VisualText::render(const Common::Point &position) {
_gfx->drawSurface(_texture, position);
}
void VisualText::setFont(FontProvider::FontType type, int32 customFontIndex) {
_font = StarkFontProvider->getFont(type, customFontIndex);
}
} // End of namespace Stark
engines/stark/visual/text.h
+3 -1
View File
@@ -63,11 +63,13 @@ private:
Gfx::Driver *_gfx;
Common::String _text;
const Graphics::Font *_font;
uint32 _color;
uint32 _backgroundColor;
uint32 _targetWidth;
Gfx::Texture *_texture;
FontProvider::FontType _fontType;
int32 _fontCustomIndex;
};
} // End of namespace Stark