Added a bold UI font

The bold UI label font is used for highlighted sidebar items and default buttons.

5 files changed, 37 insertions, 16 deletions

diff --git a/src/ui/color.c b/src/ui/color.c
index 7cbb468b..8233818e 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -167,7 +167,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiBackgroundPressed_ColorId, cyan_ColorId);
             copy_(uiBackgroundFramelessHover_ColorId, orange_ColorId);
             copy_(uiText_ColorId, black_ColorId);
-            copy_(uiTextStrong_ColorId, teal_ColorId);
+            copy_(uiTextStrong_ColorId, black_ColorId);
             copy_(uiTextPressed_ColorId, black_ColorId);
             copy_(uiTextSelected_ColorId, black_ColorId);
             copy_(uiTextDisabled_ColorId, gray50_ColorId);
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index d3be3710..6bd51731 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1174,8 +1174,9 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         }
         else {
             const iBool isUnread = (d->indent != 0);
+            const int titleFont = isUnread ? uiContentBold_FontId : uiContent_FontId;
             const int h1 = lineHeight_Text(uiLabel_FontId);
-            const int h2 = lineHeight_Text(uiContent_FontId);
+            const int h2 = lineHeight_Text(titleFont);
             const int iconPad = 9 * gap_UI;
             iRect iconArea = { addY_I2(pos, 0), init_I2(iconPad, itemHeight) };
             if (isUnread) {
@@ -1199,7 +1200,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                 deinit_String(&str);
             }
             /* Select the layout based on how the title fits. */
-            iInt2       titleSize = advanceRange_Text(uiContent_FontId, range_String(&d->label));
+            iInt2       titleSize = advanceRange_Text(titleFont, range_String(&d->label));
             const iInt2 metaSize  = advanceRange_Text(uiLabel_FontId, range_String(&d->meta));
             pos.x += iconPad;
             const int avail = width_Rect(itemRect) - iconPad - 3 * gap_UI;
@@ -1214,12 +1215,12 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                 const char *endPos;
                 tryAdvance_Text(
                     uiContent_FontId, range_String(&d->label), avail - skip, &endPos);
-                drawRange_Text(uiContent_FontId,
+                drawRange_Text(titleFont,
                                cur,
                                labelFg,
                                (iRangecc){ constBegin_String(&d->label), endPos });
                 if (endPos < constEnd_String(&d->label)) {
-                    drawRange_Text(uiContent_FontId,
+                    drawRange_Text(titleFont,
                                    addY_I2(pos, h2), labelFg,
                                    (iRangecc){ endPos, constEnd_String(&d->label) });
                 }
@@ -1227,7 +1228,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
             else {
                 pos.y += (itemHeight - h1 - h2) / 2;
                 drawRange_Text(uiLabel_FontId, pos, fg, range_String(&d->meta));
-                drawRange_Text(uiContent_FontId, addY_I2(pos, h1), labelFg, range_String(&d->label));
+                drawRange_Text(titleFont, addY_I2(pos, h1), labelFg, range_String(&d->label));
             }
         }
     }
@@ -1266,8 +1267,6 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
     }
     else if (sidebar->mode == history_SidebarMode) {
         iBeginCollect();
-        const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
-                               : uiText_ColorId;
         if (d->listItem.isSeparator) {
             if (!isEmpty_String(&d->meta)) {
                 iInt2 drawPos = addY_I2(topLeft_Rect(itemRect), d->id);
@@ -1284,6 +1283,8 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
             }
         }
         else {
+            const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
+                                   : uiHeading_ColorId;
             iUrl parts;
             init_Url(&parts, &d->label);
             const iBool isAbout  = equalCase_Rangecc(parts.scheme, "about");
@@ -1320,7 +1321,10 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         drawRange_Text(
             font, cPos, d->listItem.isSelected ? iconColor : metaFg, range_String(&icon));
         deinit_String(&icon);
-        drawRange_Text(font, add_I2(cPos, init_I2(6 * gap_UI, 0)), fg, range_String(&d->label));
+        drawRange_Text(d->listItem.isSelected ? uiContentBold_FontId : font,
+                       add_I2(cPos, init_I2(6 * gap_UI, 0)),
+                       fg,
+                       range_String(&d->label));
         drawRange_Text(default_FontId,
                        add_I2(cPos, init_I2(6 * gap_UI, lineHeight_Text(font))),
                        metaFg,
diff --git a/src/ui/text.c b/src/ui/text.c
index 2ab40387..e9ca17e7 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -224,7 +224,9 @@ static void initFonts_Text_(iText *d) {
         int symbolsFont;
     } fontData[max_FontId] = {
         { &fontSourceSansProRegular_Embedded, fontSize_UI,          1.0f, defaultSymbols_FontId },
+        { &fontSourceSansProBold_Embedded,    fontSize_UI,          1.0f, defaultSymbols_FontId },
         { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId },
+        { &fontSourceSansProBold_Embedded,    fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId },
         { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.666f, 1.0f, defaultLargeSymbols_FontId },
         { &fontIosevkaTermExtended_Embedded,  fontSize_UI * 0.866f, 1.0f, defaultSymbols_FontId },
         { &fontSourceSansProRegular_Embedded, textSize,             scaling, symbols_FontId },
diff --git a/src/ui/text.h b/src/ui/text.h
index f78f570a..217bdd13 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -31,10 +31,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 enum iFontId {
     default_FontId,
+    defaultBold_FontId,
     defaultMedium_FontId,
+    defaultMediumBold_FontId,
     defaultLarge_FontId,
     defaultMonospace_FontId,
-    defaultContentSized_FontId,
+    defaultContentSized_FontId,    
     /* content fonts */
     regular_FontId,
     monospace_FontId,
@@ -96,10 +98,12 @@ enum iFontId {
 
     /* UI fonts: */
     uiLabel_FontId          = default_FontId,
+    uiLabelBold_FontId      = defaultBold_FontId,
     uiLabelLarge_FontId     = defaultLarge_FontId,
     uiShortcuts_FontId      = default_FontId,
     uiInput_FontId          = defaultMonospace_FontId,
     uiContent_FontId        = defaultMedium_FontId,
+    uiContentBold_FontId    = defaultMediumBold_FontId,
     uiContentSymbols_FontId = defaultMediumSymbols_FontId,
     /* Document fonts: */
     paragraph_FontId         = regular_FontId,
diff --git a/src/ui/util.c b/src/ui/util.c
index 0361cd72..c626759a 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -872,12 +872,13 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
-        addChild_Widget(
+        iLabelWidget *accept = addChild_Widget(
             div,
             iClob(newKeyMods_LabelWidget(acceptLabel ? acceptLabel : uiTextAction_ColorEscape "OK",
                                          SDLK_RETURN,
                                          0,
                                          "valueinput.accept")));
+        setFont_LabelWidget(accept, uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     centerSheet_Widget(dlg);
@@ -924,8 +925,12 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg, const char *lab
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         for (size_t i = 0; i < count; ++i) {
             /* The last one is the default option. */
-            const int key = (i == count - 1 ? SDLK_RETURN : 0);
-            addChild_Widget(div, iClob(newKeyMods_LabelWidget(labels[i], key, 0, commands[i])));
+            const int     key = (i == count - 1 ? SDLK_RETURN : 0);
+            iLabelWidget *btn =
+                addChild_Widget(div, iClob(newKeyMods_LabelWidget(labels[i], key, 0, commands[i])));
+            if (key) {
+                setFont_LabelWidget(btn, uiLabelBold_FontId);
+            }
         }
     }
     addChild_Widget(dlg, iClob(div));
@@ -1168,7 +1173,10 @@ iWidget *makePreferences_Widget(void) {
     }
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
-        addChild_Widget(div, iClob(newKeyMods_LabelWidget("Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss")));
+        setFont_LabelWidget(
+            addChild_Widget(
+                div, iClob(newKeyMods_LabelWidget("Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss"))),
+            uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     addChild_Widget(get_Window()->root, iClob(dlg));
@@ -1205,10 +1213,11 @@ iWidget *makeBookmarkEditor_Widget(void) {
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
-        addChild_Widget(
+        iLabelWidget *accept = addChild_Widget(
             div,
             iClob(newKeyMods_LabelWidget(
                 uiTextCaution_ColorEscape "Save Bookmark", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept")));
+        setFont_LabelWidget(accept, uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     addChild_Widget(get_Window()->root, iClob(dlg));
@@ -1345,6 +1354,7 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
                                          KMOD_PRIMARY,
                                          format_CStr("feedcfg.accept bmid:%d", bookmarkId)))),
                      "feedcfg.save");
+        setFont_LabelWidget(findChild_Widget(div, "feedcfg.save"), uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     arrange_Widget(dlg);
@@ -1421,10 +1431,11 @@ iWidget *makeIdentityCreation_Widget(void) {
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
-        addChild_Widget(
+        iLabelWidget *accept = addChild_Widget(
             div,
             iClob(newKeyMods_LabelWidget(
                 uiTextAction_ColorEscape "Create Identity", SDLK_RETURN, KMOD_PRIMARY, "ident.accept")));
+        setFont_LabelWidget(accept, uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     addChild_Widget(get_Window()->root, iClob(dlg));