1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 21 Sep 2020 12:52:42 -0400
Subject: [PATCH] fc: Sort faces of a family
Origin: https://gitlab.gnome.org/GNOME/pango/-/commit/99f4661a
Make pango_font_family_list_faces() return faces
sorted by slant and weight. This makes the font
chooser look much less random.
---
pango/pangofc-fontmap.c | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
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;
}
|
