zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-16 01:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed the status bar string drawers which weren't UTF-8 capable yet.

Browse source 
# Conflicts:
#	src/g_statusbar/sbarinfo.cpp
#	src/g_statusbar/shared_sbar.cpp
This commit is contained in:
Christoph Oelckers 2019-02-23 19:44:00 +01:00 committed by drfrag
parent d2959760dc
commit 2ea80429a7
2 changed files with 15 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/g_statusbar/sbarinfo.cpp
View file

@ -1380,20 +1380,20 @@ public:
{
Scale = { 1.,1. };
}
while(*str != '\0')
int ch;
while (ch = GetCharFromString(str), ch != '\0')
{
if(*str == ' ')
if(ch == ' ')
{
if(script->spacingCharacter == '\0')
ax += font->GetSpaceWidth();
else
ax += font->GetCharWidth((unsigned char) script->spacingCharacter);
str++;
continue;
}
else if(*str == TEXTCOLOR_ESCAPE)
else if(ch == TEXTCOLOR_ESCAPE)
{
EColorRange newColor = V_ParseFontColor(++str, translation, boldTranslation);
EColorRange newColor = V_ParseFontColor(str, translation, boldTranslation);
if(newColor != CR_UNDEFINED)
fontcolor = newColor;
continue;
@ -1401,16 +1401,14 @@ public:
int width;
if(script->spacingCharacter == '\0') //No monospace?
width = font->GetCharWidth((unsigned char) *str);
width = font->GetCharWidth(ch);
else
width = font->GetCharWidth((unsigned char) script->spacingCharacter);
FTexture* c = font->GetChar((unsigned char) *str, &width);
FTexture* c = font->GetChar(ch, &width);
if(c == NULL) //missing character.
{
str++;
continue;
}
int character = (unsigned char)*str;
if(script->spacingCharacter == '\0') //If we are monospaced lets use the offset
ax += (c->LeftOffset+1); //ignore x offsets since we adapt to character size
@ -1464,14 +1462,14 @@ public:
double salpha = (Alpha *HR_SHADOW);
double srx = rx + (shadowX*Scale.X);
double sry = ry + (shadowY*Scale.Y);
screen->DrawChar(font, CR_UNTRANSLATED, srx, sry, character,
screen->DrawChar(font, CR_UNTRANSLATED, srx, sry, ch,
DTA_DestWidthF, rw,
DTA_DestHeightF, rh,
DTA_Alpha, salpha,
DTA_FillColor, 0,
TAG_DONE);
}
screen->DrawChar(font, fontcolor, rx, ry, character,
screen->DrawChar(font, fontcolor, rx, ry, ch,
DTA_DestWidthF, rw,
DTA_DestHeightF, rh,
DTA_Alpha, Alpha,
@ -1480,7 +1478,6 @@ public:
ax += width + spacing - (c->LeftOffset+1);
else //width gets changed at the call to GetChar()
ax += font->GetCharWidth((unsigned char) script->spacingCharacter) + spacing;
str++;
}
}

12
src/g_statusbar/shared_sbar.cpp
View file

@ -1534,15 +1534,15 @@ void DBaseStatusBar::DrawString(FFont *font, const FString &cstring, double x, d
break;
case DI_TEXT_ALIGN_RIGHT:
if (!monospaced)
x -= static_cast<int> (font->StringWidth(cstring) + (spacing * cstring.Len()));
x -= static_cast<int> (font->StringWidth(cstring) + (spacing * cstring.CharacterCount()));
else //monospaced, so just multiply the character size
x -= static_cast<int> ((spacing) * cstring.Len());
x -= static_cast<int> ((spacing) * cstring.CharacterCount());
break;
case DI_TEXT_ALIGN_CENTER:
if (!monospaced)
x -= static_cast<int> (font->StringWidth(cstring) + (spacing * cstring.Len())) / 2;
x -= static_cast<int> (font->StringWidth(cstring) + (spacing * cstring.CharacterCount())) / 2;
else //monospaced, so just multiply the character size
x -= static_cast<int> ((spacing)* cstring.Len()) / 2;
x -= static_cast<int> ((spacing)* cstring.CharacterCount()) / 2;
break;
}
@ -1580,7 +1580,7 @@ void DBaseStatusBar::DrawString(FFont *font, const FString &cstring, double x, d
Scale = { 1.,1. };
}
int ch;
while (ch = *str++, ch != '\0')
while (ch = GetCharFromString(str), ch != '\0')
{
if (ch == ' ')
{
@ -1596,7 +1596,7 @@ void DBaseStatusBar::DrawString(FFont *font, const FString &cstring, double x, d
}
int width;
FTexture* c = font->GetChar((unsigned char)ch, &width);
FTexture* c = font->GetChar(ch, &width);
if (c == NULL) //missing character.
{
continue;