Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-02-06 00:01:57 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix "Fl::get_font_name() with Pango is inconsistent"-cont'd (#732)

Browse Source
This commit is contained in:
ManoloFLTK
2023-06-06 16:55:05 +02:00
parent bba90ce005
commit 033ad1d732
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1092,10 +1092,13 @@ Fl_Font Fl_Cairo_Graphics_Driver::set_fonts(const char* /*pattern_name*/)
pango_font_family_list_faces(families[fam], &faces, &n_faces);
for (int j = 0; j < n_faces; j++) {
const char *p = pango_font_face_get_face_name(faces[j]);
// Remove " Regular" suffix from font names
if (!strcasecmp(p, "regular")) p = NULL;
// build the font's FLTK name
int lfont = lfam + strlen(p) + 2;
int lfont = lfam + (p ? strlen(p) + 2 : 1);
char *q = new char[lfont];
snprintf(q, lfont, "%s %s", fam_name, p);
if (p) snprintf(q, lfont, "%s %s", fam_name, p);
else strcpy(q, fam_name);
Fl::set_font((Fl_Font)(count++ + FL_FREE_FONT), q);
}
/*g_*/free(faces); // glib source code shows that g_free is equivalent to free

7
src/drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.cxx
View File

@@ -1412,10 +1412,13 @@ Fl_Font Fl_Xlib_Graphics_Driver::set_fonts(const char* pattern_name)
pango_font_family_list_faces(families[fam], &faces, &n_faces);
for (int j = 0; j < n_faces; j++) {
const char *p = pango_font_face_get_face_name(faces[j]);
// Remove " Regular" suffix from font names
if (!strcasecmp(p, "regular")) p = NULL;
// build the font's FLTK name
int lfont = lfam + strlen(p) + 2;
int lfont = lfam + (p ? strlen(p) + 2 : 1);
char *q = new char[lfont];
snprintf(q, lfont, "%s %s", fam_name, p);
if (p) snprintf(q, lfont, "%s %s", fam_name, p);
else strcpy(q, fam_name);
Fl::set_font((Fl_Font)(count++ + FL_FREE_FONT), q);
}
/*g_*/free(faces); // glib source code shows that g_free is equivalent to free