libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-18 18:30:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BAGEL: Fix rendering of unicode text

Browse Source
This commit is contained in:
SupSuper 2024-05-14 20:37:44 +01:00
parent c78780bca0
commit aabaca0d13
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/bagel/boflib/gfx/text.cpp
View File

@ -404,29 +404,29 @@ ErrorCode CBofText::displayTextEx(CBofBitmap *pBmp, const char *pszText, CBofRec
}
void CBofText::displayLine(Graphics::Font *font, Graphics::ManagedSurface &surface,
const Common::String &line, int left, int top, int width, int color, Graphics::TextAlign align) {
const Common::U32String &line, int left, int top, int width, int color, Graphics::TextAlign align) {
if (!line.contains('\t')) {
font->drawString(&surface, line, left, top, width, color, align);
} else {
// Special rendering of tabbed text
Common::String str = line;
Common::U32String str = line;
while (!str.empty()) {
if (str.hasPrefix("\t")) {
if (str[0] == '\t') {
// Move to next tab stop
left = (left + TAB_SIZE) / TAB_SIZE * TAB_SIZE;
str.deleteChar(0);
} else {
Common::String fragment;
Common::U32String fragment;
size_t tab = str.findFirstOf('\t');
if (tab == Common::String::npos) {
if (tab == Common::U32String::npos) {
fragment = str;
str.clear();
} else {
fragment = Common::String(str.c_str(), str.c_str() + tab);
str = Common::String(str.c_str() + tab);
fragment = Common::U32String(str.c_str(), str.c_str() + tab);
str = Common::U32String(str.c_str() + tab);
}
int fragmentWidth = font->getStringWidth(fragment);

2
engines/bagel/boflib/gfx/text.h
View File

@ -289,7 +289,7 @@ private:
ErrorCode displayText(CBofWindow *pWnd, const char *pszText, CBofRect *pRect, const int nSize, const int nWeight, const bool bShadowed, int nFont = FONT_DEFAULT);
ErrorCode displayText(CBofBitmap *pBmp, const char *pszText, CBofRect *pRect, const int nSize, const int nWeight, const bool bShadowed, int nFont = FONT_DEFAULT);
void displayLine(Graphics::Font *font, Graphics::ManagedSurface &surface, const Common::String &line,
void displayLine(Graphics::Font *font, Graphics::ManagedSurface &surface, const Common::U32String &line,
int left, int top, int width, int color, Graphics::TextAlign align);
protected: