Preferences: Reorganized fonts dropdown

Fonts are grouped by type.

1 files changed, 18 insertions, 5 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index e410ded1..cc17a0d3 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1901,13 +1901,26 @@ static void addRadioButton_(iWidget *parent, const char *id, const char *label,
 }
 
 static void addFontButtons_(iWidget *parent, const char *id) {
-    const char *fontNames[] = {
-        "Nunito", "Fira Sans", "Literata", "Tinos", "Source Sans 3", "Iosevka"
-    };
+    const struct {
+        const char *   name;
+        enum iTextFont cfgId;
+    } fonts[] = { { "Nunito", nunito_TextFont },
+                  { "Source Sans 3", sourceSans3_TextFont },
+                  { "Fira Sans", firaSans_TextFont },
+                  { "---", -1 },
+                  { "Literata", literata_TextFont },
+                  { "Tinos", tinos_TextFont },
+                  { "---", -1 },
+                  { "Iosevka", iosevka_TextFont } };
     iArray *items = new_Array(sizeof(iMenuItem));
-    iForIndices(i, fontNames) {
+    iForIndices(i, fonts) {
         pushBack_Array(items,
-                       &(iMenuItem){ fontNames[i], 0, 0, format_CStr("!%s.set arg:%d", id, i) });
+                       &(iMenuItem){ fonts[i].name,
+                                     0,
+                                     0,
+                                     fonts[i].cfgId >= 0
+                                         ? format_CStr("!%s.set arg:%d", id, fonts[i].cfgId)
+                                         : NULL });
     }
     iLabelWidget *button = makeMenuButton_LabelWidget("Source Sans 3", data_Array(items), size_Array(items));
     setBackgroundColor_Widget(findChild_Widget(as_Widget(button), "menu"), uiBackgroundMenu_ColorId);