mirror of
https://github.com/QB64-Phoenix-Edition/QB64pe.git
synced 2024-09-20 04:24:48 +00:00
Merge pull request #487 from a740g/main
Fix font width calculation when loading monospaced fonts
This commit is contained in:
commit
840e83676e
1 changed files with 15 additions and 3 deletions
|
@ -822,11 +822,23 @@ int32_t FontLoad(const uint8_t *content_original, int32_t content_bytes, int32_t
|
|||
fontManager.fonts[h]->options = options; // save the options for use later
|
||||
|
||||
if ((options & FONT_LOAD_MONOSPACE) || FT_IS_FIXED_WIDTH(fontManager.fonts[h]->face)) {
|
||||
const uint32_t testCP = 'W'; // since W is usually the widest
|
||||
const FT_ULong testCP = 'W'; // since W is usually the widest
|
||||
|
||||
fontManager.fonts[h]->monospaceWidth = fontManager.fonts[h]->GetStringPixelWidth(&testCP, 1);
|
||||
// Load using monochrome rendering
|
||||
if (FT_Load_Char(fontManager.fonts[h]->face, testCP, FT_LOAD_RENDER | FT_LOAD_MONOCHROME | FT_LOAD_TARGET_MONO)) {
|
||||
FONT_DEBUG_PRINT("FT_Load_Char() (monochrome) failed");
|
||||
// Retry using gray-level rendering
|
||||
if (FT_Load_Char(fontManager.fonts[h]->face, testCP, FT_LOAD_RENDER)) {
|
||||
FONT_DEBUG_PRINT("FT_Load_Char() (gray) failed");
|
||||
}
|
||||
}
|
||||
|
||||
FONT_DEBUG_PRINT("Monospace font (width = %li) requested", fontManager.fonts[h]->monospaceWidth);
|
||||
if (fontManager.fonts[h]->face->glyph) {
|
||||
fontManager.fonts[h]->monospaceWidth =
|
||||
std::max(fontManager.fonts[h]->face->glyph->advance.x / 64, (FT_Pos)fontManager.fonts[h]->face->glyph->bitmap.width); // save the max width
|
||||
|
||||
FONT_DEBUG_PRINT("Monospace font (width = %li) requested", fontManager.fonts[h]->monospaceWidth);
|
||||
}
|
||||
}
|
||||
|
||||
FONT_DEBUG_PRINT("Font (height = %i, index = %i) successfully initialized", default_pixel_height, which_font);
|
||||
|
|
Loading…
Reference in a new issue