diff --git a/src/raylib.h b/src/raylib.h index d2dc8a548..146ccca16 100644 --- a/src/raylib.h +++ b/src/raylib.h @@ -1217,6 +1217,7 @@ RLAPI void UnloadFont(Font font); RLAPI void DrawFPS(int posX, int posY); // Shows current FPS RLAPI void DrawText(const char *text, int posX, int posY, int fontSize, Color color); // Draw text (using default font) RLAPI void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint); // Draw text using font and additional parameters +RLAPI void DrawTextPro(Font font, const char *text, Vector2 position, float fontSize, float spacing, float lineSpacing, Color tint); // Draw text using font, additional parameters and line spacing RLAPI void DrawTextRec(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint); // Draw text using font inside rectangle limits RLAPI void DrawTextRecEx(Font font, const char *text, Rectangle rec, float fontSize, float spacing, bool wordWrap, Color tint, int selectStart, int selectLength, Color selectTint, Color selectBackTint); // Draw text using font inside rectangle limits with support for text selection diff --git a/src/text.c b/src/text.c index 21bb88089..37daaa7b4 100644 --- a/src/text.c +++ b/src/text.c @@ -790,7 +790,14 @@ void DrawTextCodepoint(Font font, int codepoint, Vector2 position, float scale, // Draw text using Font // NOTE: chars spacing is NOT proportional to fontSize +// NOTE: Fixed line spacing of 1.5 line-height void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, float spacing, Color tint) +{ + DrawTextPro(font, text, position, fontSize, spacing, font.baseSize * 1.5, tint); +} + +// Draw text using Font with line spacing +void DrawTextPro(Font font, const char *text, Vector2 position, float fontSize, float spacing, float lineSpacing, Color tint) { int length = TextLength(text); // Total length in bytes of the text, scanned by codepoints in loop @@ -812,9 +819,7 @@ void DrawTextEx(Font font, const char *text, Vector2 position, float fontSize, f if (codepoint == '\n') { - // NOTE: Fixed line spacing of 1.5 line-height - // TODO: Support custom line spacing defined by user - textOffsetY += (int)((font.baseSize + font.baseSize/2)*scaleFactor); + textOffsetY += (int)lineSpacing * scaleFactor; textOffsetX = 0.0f; } else