6 files changed, 61 insertions, 19 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index febaa15b..09c5812b 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -44,6 +44,7 @@ struct Impl_LabelWidget {
     struct {
         uint8_t alignVisual     : 1; /* align according to visible bounds, not font metrics */
         uint8_t noAutoMinHeight : 1; /* minimum height is not set automatically */
+        uint8_t drawAsOutline   : 1; /* draw as outline, filled with background color */
     } flags;
 };
 
@@ -348,14 +349,14 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
             cstr_String(&d->label));
     }
     else {
-        drawCentered_Text(d->font,
-                          adjusted_Rect(bounds,
-                                        add_I2(zero_I2(), init_I2(iconPad, 0)),
-                                        neg_I2(zero_I2())),
-                          d->flags.alignVisual,
-                          fg,
-                          "%s",
-                          cstr_String(&d->label));
+        drawCenteredOutline_Text(
+            d->font,
+            adjusted_Rect(bounds, add_I2(zero_I2(), init_I2(iconPad, 0)), neg_I2(zero_I2())),
+            d->flags.alignVisual,
+            d->flags.drawAsOutline ? fg : none_ColorId,
+            d->flags.drawAsOutline ? d->widget.bgColor : fg,
+            "%s",
+            cstr_String(&d->label));
     }
     if (flags & chevron_WidgetFlag) {
         const iRect chRect = rect;
@@ -442,6 +443,7 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
     setFlags_Widget(w, hover_WidgetFlag, d->click.button != 0);
     d->flags.alignVisual = iFalse;
     d->flags.noAutoMinHeight = iFalse;
+    d->flags.drawAsOutline = iFalse;
     updateSize_LabelWidget(d);
     updateKey_LabelWidget_(d); /* could be bound to another key */
 }
@@ -481,6 +483,10 @@ void setNoAutoMinHeight_LabelWidget(iLabelWidget *d, iBool noAutoMinHeight) {
     }
 }
 
+void setOutline_LabelWidget(iLabelWidget *d, iBool drawAsOutline) {
+    d->flags.drawAsOutline = drawAsOutline;
+}
+
 void updateText_LabelWidget(iLabelWidget *d, const iString *text) {
     set_String(&d->label, text);
     set_String(&d->srcLabel, text);
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 25cde95c..25c873fc 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -31,6 +31,7 @@ iDeclareObjectConstructionArgs(LabelWidget, const char *label, const char *comma
 
 void    setAlignVisually_LabelWidget(iLabelWidget *, iBool alignVisual);
 void    setNoAutoMinHeight_LabelWidget(iLabelWidget *, iBool noAutoMinHeight);
+void    setOutline_LabelWidget      (iLabelWidget *, iBool drawAsOutline);
 void    setFont_LabelWidget         (iLabelWidget *, int fontId);
 void    setTextColor_LabelWidget    (iLabelWidget *, int color);
 void    setText_LabelWidget         (iLabelWidget *, const iString *text); /* resizes widget */
diff --git a/src/ui/root.c b/src/ui/root.c
index c3a9596f..71f51ef0 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -432,9 +432,9 @@ static void updateNavBarIdentity_(iWidget *navBar) {
     const iGmIdentity *ident =
         identityForUrl_GmCerts(certs_App(), url_DocumentWidget(document_App()));
     iWidget *button = findChild_Widget(navBar, "navbar.ident");
-    iWidget *tool = findWidget_App("toolbar.ident");
+    iLabelWidget *toolButton = findWidget_App("toolbar.ident");
     setFlags_Widget(button, selected_WidgetFlag, ident != NULL);
-    setFlags_Widget(tool, selected_WidgetFlag, ident != NULL);
+    setOutline_LabelWidget(toolButton, ident == NULL);
     /* Update menu. */
     iLabelWidget *idItem = child_Widget(findChild_Widget(button, "menu"), 0);
     const iString *subjectName = ident ? name_GmIdentity(ident) : NULL;
@@ -519,12 +519,14 @@ void updateToolbarColors_Root(iRoot *d) {
     iWidget *toolBar = findChild_Widget(d->widget, "toolbar");
     if (toolBar) {
         const iBool isSidebarVisible = isVisible_Widget(findChild_Widget(d->widget, "sidebar"));
-        setBackgroundColor_Widget(toolBar, isSidebarVisible ? uiBackgroundSidebar_ColorId :
-                                  tmBannerBackground_ColorId);
+        const int bg = isSidebarVisible ? uiBackgroundSidebar_ColorId :
+                                          tmBannerBackground_ColorId;
+        setBackgroundColor_Widget(toolBar, bg);
         iForEach(ObjectList, i, children_Widget(toolBar)) {
             iLabelWidget *btn = i.object;
             setTextColor_LabelWidget(i.object, isSidebarVisible ? uiTextDim_ColorId :
                                      tmBannerIcon_ColorId);
+            setBackgroundColor_Widget(i.object, bg); /* using noBackground, but ident has outline */
         }
     }
 #else
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 5b836670..b4948821 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -1806,13 +1806,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                                                                      : uiTextFramelessHover_ColorId)
                                    : uiTextDim_ColorId;
         if (!d->listItem.isSelected && !isUsedOnDomain) {
-            /* Draw an outline of the icon. */
-            for (int off = 0; off < 4; ++off) {
-                drawRange_Text(font,
-                               add_I2(cPos, init_I2(off % 2 == 0 ? -1 : 1, off / 2 == 0 ? -1 : 1)),
-                               metaFg,
-                               range_String(&icon));
-            }
+            drawOutline_Text(font, cPos, metaFg, none_ColorId, range_String(&icon));
         }
         drawRange_Text(font,
                        cPos,
diff --git a/src/ui/text.c b/src/ui/text.c
index 27be1bec..8a70e4db 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1315,6 +1315,18 @@ void drawRangeN_Text(int fontId, iInt2 pos, int color, iRangecc text, size_t max
     drawBoundedN_Text_(fontId, pos, 0, color, text, maxChars);
 }
 
+void drawOutline_Text(int fontId, iInt2 pos, int outlineColor, int fillColor, iRangecc text) {
+    for (int off = 0; off < 4; ++off) {
+        drawRange_Text(fontId,
+                       add_I2(pos, init_I2(off % 2 == 0 ? -1 : 1, off / 2 == 0 ? -1 : 1)),
+                       outlineColor,
+                       text);
+    }
+    if (fillColor != none_ColorId) {
+        drawRange_Text(fontId, pos, fillColor, text);
+    }
+}
+
 iInt2 advanceWrapRange_Text(int fontId, int maxWidth, iRangecc text) {
     iInt2 size = zero_I2();
     const char *endp;
@@ -1356,6 +1368,31 @@ void drawCentered_Text(int fontId, iRect rect, iBool alignVisual, int color, con
     deinit_Block(&chars);
 }
 
+void drawCenteredOutline_Text(int fontId, iRect rect, iBool alignVisual, int outlineColor,
+                              int fillColor, const char *format, ...) {
+    iBlock chars;
+    init_Block(&chars, 0); {
+        va_list args;
+        va_start(args, format);
+        vprintf_Block(&chars, format, args);
+        va_end(args);
+    }
+    if (outlineColor != none_ColorId) {
+        for (int off = 0; off < 4; ++off) {
+            drawCenteredRange_Text(
+                fontId,
+                moved_Rect(rect, init_I2(off % 2 == 0 ? -1 : 1, off / 2 == 0 ? -1 : 1)),
+                alignVisual,
+                outlineColor,
+                range_Block(&chars));
+        }
+    }
+    if (fillColor != none_ColorId) {
+        drawCenteredRange_Text(fontId, rect, alignVisual, fillColor, range_Block(&chars));
+    }
+    deinit_Block(&chars);
+}
+
 void drawCenteredRange_Text(int fontId, iRect rect, iBool alignVisual, int color, iRangecc text) {
     iRect textBounds = alignVisual ? visualBounds_Text(fontId, text)
                                    : (iRect){ zero_I2(), advanceRange_Text(fontId, text) };
diff --git a/src/ui/text.h b/src/ui/text.h
index 2f2bcf3a..64a8352f 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -162,9 +162,11 @@ void    draw_Text               (int fontId, iInt2 pos, int color, const char *t
 void    drawAlign_Text          (int fontId, iInt2 pos, int color, enum iAlignment align, const char *text, ...);
 void    drawCentered_Text       (int fontId, iRect rect, iBool alignVisual, int color, const char *text, ...);
 void    drawCenteredRange_Text  (int fontId, iRect rect, iBool alignVisual, int color, iRangecc text);
+void    drawCenteredOutline_Text(int fontId, iRect rect, iBool alignVisual, int outlineColor, int fillColor, const char *text, ...);
 void    drawString_Text         (int fontId, iInt2 pos, int color, const iString *text);
 void    drawRange_Text          (int fontId, iInt2 pos, int color, iRangecc text);
 void    drawRangeN_Text         (int fontId, iInt2 pos, int color, iRangecc text, size_t maxLen);
+void    drawOutline_Text        (int fontId, iInt2 pos, int outlineColor, int fillColor, iRangecc text);
 void    drawBoundRange_Text     (int fontId, iInt2 pos, int boundWidth, int color, iRangecc text); /* bound does not wrap */
 int     drawWrapRange_Text      (int fontId, iInt2 pos, int maxWidth, int color, iRangecc text); /* returns new Y */