mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set line height as computed by Pango.

Browse Source
This commit is contained in:
ManoloFLTK 2022-05-02 12:41:20 +02:00
parent 85cf597765
commit 049cef17f7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/drivers/Cairo/Fl_Cairo_Graphics_Driver.H
View File

@ -34,6 +34,7 @@ public:
FL_EXPORT ~Fl_Cairo_Font_Descriptor();
PangoFontDescription *fontref;
int **width; // array of arrays of character widths
int line_height;
};

3
src/drivers/Cairo/Fl_Cairo_Graphics_Driver.cxx
View File

@ -917,7 +917,7 @@ void Fl_Cairo_Graphics_Driver::delete_bitmask(fl_uintptr_t bm) {
int Fl_Cairo_Graphics_Driver::height() {
if (!font_descriptor()) font(0, 12);
return (font_descriptor()->ascent + font_descriptor()->descent) * 1.25;
return ((Fl_Cairo_Font_Descriptor*)font_descriptor())->line_height;
}
@ -1063,6 +1063,7 @@ Fl_Cairo_Font_Descriptor::Fl_Cairo_Font_Descriptor(const char* name, Fl_Fontsize
PangoFontMetrics *metrics = pango_fontset_get_metrics(fontset);
ascent = pango_font_metrics_get_ascent(metrics)/PANGO_SCALE;
descent = pango_font_metrics_get_descent(metrics)/PANGO_SCALE;
line_height = ceil(pango_font_metrics_get_height(metrics)/double(PANGO_SCALE));
q_width = pango_font_metrics_get_approximate_char_width(metrics)/PANGO_SCALE;
pango_font_metrics_unref(metrics);
g_object_unref(fontset);