diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-09-21 12:52:42 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-09-21 15:15:27 -0400 |
commit | 99f4661a4f19802ba122fae09668a0b0e1cb7ca0 (patch) | |
tree | bf5b82f18db5ef518951e7702f67e45949dafce9 /pango/pangofc-fontmap.c | |
parent | 296711130ef90d9555bd6ada5b258bb75d622c12 (diff) | |
download | pango-99f4661a4f19802ba122fae09668a0b0e1cb7ca0.tar.gz |
fc: Sort faces of a family
Make pango_font_family_list_faces() return faces
sorted by slant and weight. This makes the font
chooser look much less random.
Diffstat (limited to 'pango/pangofc-fontmap.c')
-rw-r--r-- | pango/pangofc-fontmap.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index eed0960a..341b2d6c 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -2726,6 +2726,32 @@ create_face (PangoFcFamily *fcfamily, return face; } +static int +compare_face (const void *p1, const void *p2) +{ + const PangoFcFace *f1 = *(const void **)p1; + const PangoFcFace *f2 = *(const void **)p2; + int w1, w2; + int s1, s2; + + if (FcPatternGetInteger (f1->pattern, FC_WEIGHT, 0, &w1) != FcResultMatch) + w1 = FC_WEIGHT_MEDIUM; + + if (FcPatternGetInteger (f1->pattern, FC_SLANT, 0, &s1) != FcResultMatch) + s1 = FC_SLANT_ROMAN; + + if (FcPatternGetInteger (f2->pattern, FC_WEIGHT, 0, &w2) != FcResultMatch) + w2 = FC_WEIGHT_MEDIUM; + + if (FcPatternGetInteger (f2->pattern, FC_SLANT, 0, &s2) != FcResultMatch) + s2 = FC_SLANT_ROMAN; + + if (s1 != s2) + return s1 - s2; /* roman < italic < oblique */ + + return w1 - w2; /* from light to heavy */ +} + static void ensure_faces (PangoFcFamily *fcfamily) { @@ -2835,6 +2861,8 @@ ensure_faces (PangoFcFamily *fcfamily) faces = g_renew (PangoFcFace *, faces, num); + qsort (faces, num, sizeof (PangoFcFace *), compare_face); + fcfamily->n_faces = num; fcfamily->faces = faces; } |