mirror of
https://github.com/NoelFB/blah.git
synced 2024-11-29 17:08:56 +08:00
Merge branch 'master' of https://github.com/NoelFB/blah
This commit is contained in:
commit
86e15adf0f
|
@ -784,9 +784,9 @@ void Batch::str(const SpriteFont& font, const String& text, const Vec2& pos, Tex
|
|||
if ((align & TextAlign::Top) == TextAlign::Top)
|
||||
offset.y = font.ascent() + font.descent();
|
||||
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
|
||||
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++)
|
||||
{
|
||||
|
@ -829,4 +829,4 @@ void Batch::str(const SpriteFont& font, const String& text, const Vec2& pos, Tex
|
|||
}
|
||||
|
||||
pop_matrix();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user