eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-06 01:12:40 +02:00
Code Issues Releases Activity

Merge branch 'fix_skia_font_issue' into 'master'

Browse Source 
GimpFontFactory: don't match postscript name on Skia font family

Closes #14659

See merge request GNOME/gimp!2487
This commit is contained in:
Idriss Fekir
2025-10-04 01:32:50 +01:00
parent a5182a010f 288ba69510
commit 44e910876f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/text/gimpfontfactory.c
View File

@@ -1002,7 +1002,6 @@ gimp_font_factory_load_names (GimpFontFactory *factory)
"<edit name=\"family\" mode=\"prepend\" binding=\"strong\"><string>%s</string></edit>",
escaped_fullname);
g_free (escaped_fullname);
g_free (family);
escaped_file = g_markup_escape_text (file, -1);
g_string_append_printf (xml,
@@ -1010,7 +1009,10 @@ gimp_font_factory_load_names (GimpFontFactory *factory)
escaped_file);
g_free (escaped_file);
if (psname != NULL && g_utf8_validate (psname, -1, NULL))
/*Skia behaves in a way such that pango recognizes every font in the famy as Bold, unless we don't match with the psname.
* Until we figure out why this is the best we can do.
*/
if (psname != NULL && g_utf8_validate (psname, -1, NULL) && g_strcmp0 (family, "Skia"))
{
psname = g_markup_escape_text (psname, -1);
g_string_append_printf (xml,
@@ -1018,6 +1020,7 @@ gimp_font_factory_load_names (GimpFontFactory *factory)
psname);
g_free (psname);
}
g_free (family);
if (style != NULL && g_utf8_validate (style, -1, NULL))
{