Merge branch 'master' of mkxp
This commit is contained in:
commit
115ea9d8f7
4 changed files with 9 additions and 3 deletions
|
|
@ -1107,6 +1107,8 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
|
|||
|
||||
p->ensureFormat(txtSurf, SDL_PIXELFORMAT_ABGR8888);
|
||||
|
||||
int rawTxtSurfH = txtSurf->h;
|
||||
|
||||
if (p->font->getShadow())
|
||||
applyShadow(txtSurf, *p->format, c);
|
||||
|
||||
|
|
@ -1155,7 +1157,7 @@ void Bitmap::drawText(const IntRect &rect, const char *str, int align)
|
|||
if (alignX < rect.x)
|
||||
alignX = rect.x;
|
||||
|
||||
int alignY = rect.y + (rect.h - txtSurf->h) / 2;
|
||||
int alignY = rect.y + (rect.h - rawTxtSurfH) / 2;
|
||||
|
||||
float squeeze = (float) rect.w / txtSurf->w;
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue