zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-09 01:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

- reapply PR 1512 which was accidentally deleted

Browse source
This commit is contained in:
Christoph Oelckers 2022-08-09 10:48:00 +02:00
parent 362b41be1a
commit 4710a40fb5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/common/statusbar/base_sbar.cpp
View file

@ -745,7 +745,7 @@ void DStatusBarCore::DrawString(FFont* font, const FString& cstring, double x, d
{ {
if (ch == ' ') if (ch == ' ')
{ {
x += monospaced ? spacing : font->GetSpaceWidth() + spacing; x += (monospaced ? spacing : font->GetSpaceWidth() + spacing) * scaleX;
continue; continue;
} }
else if (ch == TEXTCOLOR_ESCAPE) else if (ch == TEXTCOLOR_ESCAPE)
@ -765,7 +765,7 @@ void DStatusBarCore::DrawString(FFont* font, const FString& cstring, double x, d
width += font->GetDefaultKerning(); width += font->GetDefaultKerning();
if (!monospaced) //If we are monospaced lets use the offset if (!monospaced) //If we are monospaced lets use the offset
x += (c->GetDisplayLeftOffset() + 1); //ignore x offsets since we adapt to character size x += (c->GetDisplayLeftOffset() * scaleX + 1); //ignore x offsets since we adapt to character size
double rx, ry, rw, rh; double rx, ry, rw, rh;
rx = x + drawOffset.X; rx = x + drawOffset.X;
@ -816,12 +816,12 @@ void DStatusBarCore::DrawString(FFont* font, const FString& cstring, double x, d
DTA_LegacyRenderStyle, ERenderStyle(style), DTA_LegacyRenderStyle, ERenderStyle(style),
TAG_DONE); TAG_DONE);
dx = monospaced
? spacing
: width + spacing - (c->GetDisplayLeftOffset() + 1);
// Take text scale into account // Take text scale into account
x += dx * scaleX; dx = monospaced
? spacing * scaleX
: (double(width) + spacing - c->GetDisplayLeftOffset()) * scaleX - 1;
x += dx;
} }
} }