Browse Source

Revert "Fixes the issue that font size is inconsistent."

This reverts commit 69e1a47511.

Only reverts fontstash.h, not the whole commit.
shared-context
Andrew Belt 3 years ago
parent
commit
911b7edf17
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      src/fontstash.h

+ 3
- 3
src/fontstash.h View File

@@ -194,7 +194,7 @@ void fons__tt_getFontVMetrics(FONSttFontImpl *font, int *ascent, int *descent, i

float fons__tt_getPixelHeightScale(FONSttFontImpl *font, float size)
{
return size / font->font->units_per_EM;
return size / (font->font->ascender - font->font->descender);
}

int fons__tt_getGlyphIndex(FONSttFontImpl *font, int codepoint)
@@ -210,7 +210,7 @@ int fons__tt_buildGlyphBitmap(FONSttFontImpl *font, int glyph, float size, float
FT_Fixed advFixed;
FONS_NOTUSED(scale);

ftError = FT_Set_Pixel_Sizes(font->font, 0, size);
ftError = FT_Set_Pixel_Sizes(font->font, 0, (FT_UInt)(size * (float)font->font->units_per_EM / (float)(font->font->ascender - font->font->descender)));
if (ftError) return 0;
ftError = FT_Load_Glyph(font->font, glyph, FT_LOAD_RENDER | FT_LOAD_FORCE_AUTOHINT | FT_LOAD_TARGET_LIGHT);
if (ftError) return 0;
@@ -300,7 +300,7 @@ void fons__tt_getFontVMetrics(FONSttFontImpl *font, int *ascent, int *descent, i

float fons__tt_getPixelHeightScale(FONSttFontImpl *font, float size)
{
return stbtt_ScaleForMappingEmToPixels(&font->font, size);
return stbtt_ScaleForPixelHeight(&font->font, size);
}

int fons__tt_getGlyphIndex(FONSttFontImpl *font, int codepoint)


Loading…
Cancel
Save