diff options
| -rw-r--r-- | main.c | 9 | ||||
| -rw-r--r-- | ted.c | 3 | ||||
| -rw-r--r-- | text.c | 8 |
3 files changed, 11 insertions, 9 deletions
@@ -607,6 +607,15 @@ int main(int argc, char **argv) { ted_update_window_dimensions(ted); + + { + Settings *active_settings = ted_active_settings(ted); + // we don't properly handle variable-width fonts + text_font_set_force_monospace(ted->font, active_settings->force_monospace); + text_font_set_force_monospace(ted->font_bold, active_settings->force_monospace); + } + + SDL_Event event; while (SDL_PollEvent(&event)) { TextBuffer *buffer = ted->active_buffer; @@ -294,9 +294,6 @@ static void ted_load_font(Ted *ted, const char *filename, Font **out) { if (ted_get_file(ted, filename, font_filename, sizeof font_filename)) { Font *font = text_font_load(font_filename, ted_active_settings(ted)->text_size); if (font) { - // we don't properly handle variable-width fonts - text_font_set_force_monospace(font, true); - if (*out) { text_font_free(*out); } @@ -195,12 +195,8 @@ Font *text_font_load(const char *ttf_filename, float font_size) { font->char_height = font_size; font->ttf_data = file_data; if (text_load_char_page(font, 0)) { // load page with Latin text, etc. - // calculate width of the character 'a' - stbtt_aligned_quad q = {0}; - float x = 0, y = 0; - stbtt_GetBakedQuad(font->char_pages[0], font->tex_widths[0], font->tex_heights[0], - 'a', &x, &y, &q, 1); - font->space_width = x; + // calculate width of the character ' ' + font->space_width = font->char_pages[0][' '].xadvance; } } else { text_set_err("Couldn't read font file."); |