summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-09-21 12:52:42 -0400
committerMatthias Clasen <mclasen@redhat.com>2020-09-21 12:52:42 -0400
commitc36b573fda672434d8a6c8a2a64a771212c4eead (patch)
tree3c5726b01f1dcf041653fe32f9cf6cf8764ff4b3
parent218aad0fc1d9823b2b8ea4c91da534982f6ddb0c (diff)
downloadpango-c36b573fda672434d8a6c8a2a64a771212c4eead.tar.gz
fc: Sort faces of a familysort-faces
Make pango_font_family_list_faces() return faces sorted by slant and weight. This makes the font chooser look much less random.
-rw-r--r--pango/pangofc-fontmap.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c
index e120d305..0f211c46 100644
--- a/pango/pangofc-fontmap.c
+++ b/pango/pangofc-fontmap.c
@@ -2805,6 +2805,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)
{
@@ -2914,6 +2940,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;
}