gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move member q_width from class Fl_Font_Descriptor to Fl_Quartz_Font_Descriptor.

Browse Source 
That's because this member is used only in Fl_Quartz_Font_Descriptor.
This commit is contained in:
ManoloFLTK 2022-07-06 10:18:40 +02:00
parent c6659c9a29
commit f097141662
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/Fl_Graphics_Driver.H
View File

@ -390,7 +390,7 @@ public:
Fl_Fontsize size; /**< font size */
Fl_Font_Descriptor(const char* fontname, Fl_Fontsize size);
FL_EXPORT ~Fl_Font_Descriptor() {}
short ascent, descent, q_width;
short ascent, descent;
unsigned int listbase;// base of display list, 0 = none
};

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

@ -1090,10 +1090,9 @@ Fl_Cairo_Font_Descriptor::Fl_Cairo_Font_Descriptor(const char* name, Fl_Fontsize
#else
line_height = (pango_font_metrics_get_ascent(metrics) + pango_font_metrics_get_descent(metrics)) * 1.025 + 0.5;
#endif
q_width = 0; // useless;
pango_font_metrics_unref(metrics);
g_object_unref(fontset);
//fprintf(stderr, "[%s](%d) ascent=%d descent=%d q_width=%d\n", name, size, ascent, descent, q_width);
//fprintf(stderr, "[%s](%d) ascent=%d descent=%d\n", name, size, ascent, descent);
}

1
src/drivers/Quartz/Fl_Font.H
View File

@ -39,6 +39,7 @@ public:
ATSUTextLayout layout;
ATSUStyle style;
# endif
short q_width;
};
extern FL_EXPORT Fl_Fontdesc *fl_fonts; // the table