mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2024-11-29 17:08:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/NoelFB/blah

Browse Source
This commit is contained in:
Noel Berry 2020-09-16 21:33:43 -07:00
commit 86e15adf0f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/blah/drawing/batch.cpp
View File

@ -784,9 +784,9 @@ void Batch::str(const SpriteFont& font, const String& text, const Vec2& pos, Tex
if ((align & TextAlign::Top) == TextAlign::Top) if ((align & TextAlign::Top) == TextAlign::Top)
offset.y = font.ascent() + font.descent(); offset.y = font.ascent() + font.descent();
else if ((align & TextAlign::Bottom) == TextAlign::Bottom) else if ((align & TextAlign::Bottom) == TextAlign::Bottom)
offset.y = font.ascent() + font.descent() - font.height_of(text); offset.y = font.height() - font.height_of(text);
else else
offset.y = font.ascent() + font.descent() - font.height_of(text) * 0.5f; offset.y = (font.ascent() + font.descent() + font.height() - font.height_of(text)) * 0.5f;
for (int i = 0, l = text.length(); i < l; i++) for (int i = 0, l = text.length(); i < l; i++)
{ {
@ -829,4 +829,4 @@ void Batch::str(const SpriteFont& font, const String& text, const Vec2& pos, Tex
} }
pop_matrix(); pop_matrix();
} }