Source Sans Pro and Iosevka as font options

Allow the UI and monospace fonts to be used as page content fonts.

4 files changed, 67 insertions, 19 deletions

diff --git a/src/app.c b/src/app.c
index 929cc8a2..c04347b0 100644
--- a/src/app.c
+++ b/src/app.c
@@ -987,18 +987,27 @@ static void updatePrefsThemeButtons_(iWidget *d) {
     }
 }
 
-static void updateColorThemeButton_(iLabelWidget *button, int theme) {
-    const char *mode    = strstr(cstr_String(id_Widget(as_Widget(button))), ".dark") ? "dark" : "light";
-    const char *command = format_CStr("doctheme.%s.set arg:%d", mode, theme);
-    iForEach(ObjectList, i, children_Widget(findChild_Widget(as_Widget(button), "menu"))) {
+static void updateDropdownSelection_(iLabelWidget *dropButton, const char *selectedCommand) {
+    iForEach(ObjectList, i, children_Widget(findChild_Widget(as_Widget(dropButton), "menu"))) {
         iLabelWidget *item = i.object;
-        if (!cmp_String(command_LabelWidget(item), command)) {
-            updateText_LabelWidget(button, text_LabelWidget(item));
-            break;
+        const iBool isSelected = endsWith_String(command_LabelWidget(item), selectedCommand);
+        setFlags_Widget(as_Widget(item), selected_WidgetFlag, isSelected);
+        if (isSelected) {
+            updateText_LabelWidget(dropButton, text_LabelWidget(item));
         }
     }
 }
 
+static void updateColorThemeButton_(iLabelWidget *button, int theme) {
+//    const char *mode = strstr(cstr_String(id_Widget(as_Widget(button))), ".dark")
+//                           ? "dark" : "light";
+    updateDropdownSelection_(button, format_CStr(".set arg:%d", theme));
+}
+
+static void updateFontButton_(iLabelWidget *button, int font) {
+    updateDropdownSelection_(button, format_CStr(".set arg:%d", font));
+}
+
 static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
     if (equal_Command(cmd, "prefs.dismiss") || equal_Command(cmd, "preferences")) {
         setUiScale_Window(get_Window(),
@@ -1050,6 +1059,14 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         updateColorThemeButton_(findChild_Widget(d, "prefs.doctheme.light"), arg_Command(cmd));
         return iFalse;
     }
+    else if (equal_Command(cmd, "font.set")) {
+        updateFontButton_(findChild_Widget(d, "prefs.font"), arg_Command(cmd));
+        return iFalse;
+    }
+    else if (equal_Command(cmd, "headingfont.set")) {
+        updateFontButton_(findChild_Widget(d, "prefs.headingfont"), arg_Command(cmd));
+        return iFalse;
+    }
     else if (equal_Command(cmd, "prefs.ostheme.changed")) {
         postCommandf_App("ostheme arg:%d", arg_Command(cmd));
     }
@@ -1518,7 +1535,7 @@ iBool handleCommand_App(const char *cmd) {
     }
     else if (equal_Command(cmd, "preferences")) {
         iWidget *dlg = makePreferences_Widget();
-        updatePrefsThemeButtons_(dlg);
+        updatePrefsThemeButtons_(dlg);        
         setText_InputWidget(findChild_Widget(dlg, "prefs.downloads"), &d->prefs.downloadDir);
         setToggle_Widget(findChild_Widget(dlg, "prefs.hoverlink"), d->prefs.hoverLink);
         setToggle_Widget(findChild_Widget(dlg, "prefs.smoothscroll"), d->prefs.smoothScrolling);
@@ -1554,6 +1571,8 @@ iBool handleCommand_App(const char *cmd) {
         setToggle_Widget(findChild_Widget(dlg, "prefs.centershort"), d->prefs.centerShortDocs);
         updateColorThemeButton_(findChild_Widget(dlg, "prefs.doctheme.dark"), d->prefs.docThemeDark);
         updateColorThemeButton_(findChild_Widget(dlg, "prefs.doctheme.light"), d->prefs.docThemeLight);
+        updateFontButton_(findChild_Widget(dlg, "prefs.font"), d->prefs.font);
+        updateFontButton_(findChild_Widget(dlg, "prefs.headingfont"), d->prefs.headingFont);
         setFlags_Widget(
             findChild_Widget(
                 dlg, format_CStr("prefs.saturation.%d", (int) (d->prefs.saturation * 3.99f))),
diff --git a/src/ui/text.c b/src/ui/text.c
index 6f6a52ed..d3b8df37 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -232,6 +232,18 @@ static void initFonts_Text_(iText *d) {
         italicFont  = &fontLiterataLightItalicopsz10_Embedded;
         lightFont   = &fontLiterataExtraLightopsz18_Embedded;
     }
+    else if (d->contentFont == sourceSansPro_TextFont) {
+        regularFont = &fontSourceSansProRegular_Embedded;
+        italicFont  = &fontFiraSansItalic_Embedded;
+        lightFont   = &fontFiraSansLight_Embedded;
+        lightScaling = 0.85f;
+    }
+    else if (d->contentFont == iosevka_TextFont) {
+        regularFont = &fontIosevkaTermExtended_Embedded;
+        italicFont  = &fontIosevkaTermExtended_Embedded;
+        lightFont   = &fontIosevkaTermExtended_Embedded;
+        scaling     = lightScaling = 0.866f;
+    }
     if (d->headingFont == firaSans_TextFont) {
         h12Font     = &fontFiraSansBold_Embedded;
         h3Font      = &fontFiraSansRegular_Embedded;
@@ -246,6 +258,14 @@ static void initFonts_Text_(iText *d) {
         h12Font = &fontLiterataBoldopsz36_Embedded;
         h3Font  = &fontLiterataRegularopsz14_Embedded;
     }
+    else if (d->headingFont == sourceSansPro_TextFont) {
+        h12Font = &fontSourceSansProBold_Embedded;
+        h3Font = &fontSourceSansProRegular_Embedded;
+    }
+    else if (d->headingFont == iosevka_TextFont) {
+        h12Font = &fontIosevkaTermExtended_Embedded;
+        h3Font  = &fontIosevkaTermExtended_Embedded;
+    }
 #if defined (iPlatformAppleMobile)
     const float uiSize = fontSize_UI * 1.1f;
 #else
diff --git a/src/ui/text.h b/src/ui/text.h
index 55524db1..f696b2e3 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -148,6 +148,8 @@ enum iTextFont {
     firaSans_TextFont,
     literata_TextFont,
     tinos_TextFont,
+    sourceSansPro_TextFont,
+    iosevka_TextFont,
 };
 
 extern int gap_Text; /* affected by content font size */
diff --git a/src/ui/util.c b/src/ui/util.c
index 4f0cb2fa..d255bde4 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1144,14 +1144,21 @@ 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"
+        "Nunito", "Fira Sans", "Literata", "Tinos", "Source Sans Pro", "Iosevka"
     };
+    iArray *items = new_Array(sizeof(iMenuItem));
     iForIndices(i, fontNames) {
-        addRadioButton_(parent,
-                        format_CStr("prefs.%s.%u", id, i),
-                        fontNames[i],
-                        format_CStr("%s.set arg:%u", id, i));
+        pushBack_Array(items,
+                       &(iMenuItem){ fontNames[i], 0, 0, format_CStr("!%s.set arg:%d", id, i) });
     }
+//        addRadioButton_(parent,
+//                        format_CStr("prefs.%s.%u", id, i),
+//                        fontNames[i],
+//                        format_CStr("%s.set arg:%u", id, i));
+    iLabelWidget *button = makeMenuButton_LabelWidget("Source Sans Pro", data_Array(items), size_Array(items));
+    setId_Widget(as_Widget(button), format_CStr("prefs.%s", id));
+    addChild_Widget(parent, iClob(button));
+    delete_Array(items);
 }
 
 iWidget *makePreferences_Widget(void) {
@@ -1243,13 +1250,13 @@ iWidget *makePreferences_Widget(void) {
         /* Fonts. */ {
             iWidget *fonts;
             addChild_Widget(headings, iClob(makeHeading_Widget("Heading font:")));
-            fonts = new_Widget();
-            addFontButtons_(fonts, "headingfont");
-            addChildFlags_Widget(values, iClob(fonts), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+//            fonts = new_Widget();
+            addFontButtons_(values, "headingfont");
+//            addChildFlags_Widget(values, iClob(fonts), 0); //arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
             addChild_Widget(headings, iClob(makeHeading_Widget("Body font:")));
-            fonts = new_Widget();
-            addFontButtons_(fonts, "font");
-            addChildFlags_Widget(values, iClob(fonts), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
+//            fonts = new_Widget();
+            addFontButtons_(values, "font");
+//            addChildFlags_Widget(values, iClob(fonts), 0); //arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
             addChild_Widget(headings, iClob(makeHeading_Widget("Monospace body:")));
             iWidget *mono = new_Widget();
             /* TODO: Needs labels! */