6 files changed, 87 insertions, 42 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index de633e3c..bfb71913 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -291,12 +291,13 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
 static const iChar sensitiveChar_ = 0x25cf; /* black circle */
 
 static void draw_InputWidget_(const iInputWidget *d) {
+    const iWidget *w      = constAs_Widget(d);
     const uint32_t time   = frameTime_Window(get_Window());
     const iInt2 padding   = init_I2(gap_UI / 2, gap_UI / 2);
-    iRect       bounds    = adjusted_Rect(bounds_Widget(constAs_Widget(d)), padding, neg_I2(padding));
-    const iBool isFocused = isFocused_Widget(constAs_Widget(d));
-    const iBool isHover   = isHover_Widget(constAs_Widget(d)) &&
-                            contains_Widget(constAs_Widget(d), mouseCoord_Window(get_Window()));    
+    iRect       bounds    = adjusted_Rect(bounds_Widget(w), padding, neg_I2(padding));
+    const iBool isFocused = isFocused_Widget(w);
+    const iBool isHover   = isHover_Widget(w) &&
+                            contains_Widget(w, mouseCoord_Window(get_Window()));
     iPaint p;
     init_Paint(&p);
     iString text;
@@ -314,7 +315,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
                    adjusted_Rect(bounds, neg_I2(one_I2()), zero_I2()),
                    isFocused ? orange_ColorId : isHover ? cyan_ColorId : gray50_ColorId);
     setClip_Paint(&p, bounds);
-    shrink_Rect(&bounds, init_I2(gap_UI * 2, 0));
+    shrink_Rect(&bounds, init_I2(gap_UI * (flags_Widget(w) & tight_WidgetFlag ? 1 : 2), 0));
     const iInt2 emSize    = advance_Text(d->font, "M");
     const int   textWidth = advance_Text(d->font, cstr_String(&text)).x;
     const int   cursorX   = advanceN_Text(d->font, cstr_String(&text), d->cursor).x;
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index d3eaed11..c246c0c4 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -5,7 +5,9 @@
 #include "app.h"
 #include "util.h"
 
-iLocalDef iInt2 padding_(void) { return init_I2(3 * gap_UI, gap_UI); }
+iLocalDef iInt2 padding_(int flags) {
+    return init_I2(flags & tight_WidgetFlag ? 3 * gap_UI / 2 : (3 * gap_UI), gap_UI);
+}
 
 struct Impl_LabelWidget {
     iWidget widget;
@@ -14,6 +16,7 @@ struct Impl_LabelWidget {
     int     key;
     int     kmods;
     iString command;
+    iBool   alignVisual; /* align according to visible bounds, not typography */
     iClick  click;
 };
 
@@ -191,13 +194,13 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     }
     setClip_Paint(&p, rect);
     if (flags & alignLeft_WidgetFlag) {
-        draw_Text(d->font, add_I2(bounds.pos, padding_()), fg, cstr_String(&d->label));
+        draw_Text(d->font, add_I2(bounds.pos, padding_(flags)), fg, cstr_String(&d->label));
         if ((flags & drawKey_WidgetFlag) && d->key) {
             iString str;
             init_String(&str);
             keyStr_LabelWidget_(d, &str);
             drawAlign_Text(uiShortcuts_FontId,
-                           add_I2(topRight_Rect(bounds), negX_I2(padding_())),
+                           add_I2(topRight_Rect(bounds), negX_I2(padding_(flags))),
                            flags & pressed_WidgetFlag ? fg : cyan_ColorId,
                            right_Alignment,
                            cstr_String(&str));
@@ -207,13 +210,13 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
     else if (flags & alignRight_WidgetFlag) {
         drawAlign_Text(
             d->font,
-            add_I2(topRight_Rect(bounds), negX_I2(padding_())),
+            add_I2(topRight_Rect(bounds), negX_I2(padding_(flags))),
             fg,
             right_Alignment,
             cstr_String(&d->label));
     }
     else {
-        drawCentered_Text(d->font, bounds, fg, cstr_String(&d->label));
+        drawCentered_Text(d->font, bounds, d->alignVisual, fg, cstr_String(&d->label));
     }
     clearClip_Paint(&p);
 }
@@ -221,7 +224,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
 void updateSize_LabelWidget(iLabelWidget *d) {
     iWidget *w = as_Widget(d);
     const int flags = flags_Widget(w);
-    iInt2 size = add_I2(measure_Text(d->font, cstr_String(&d->label)), muli_I2(padding_(), 2));
+    iInt2 size = add_I2(measure_Text(d->font, cstr_String(&d->label)), muli_I2(padding_(flags), 2));
     if ((flags & drawKey_WidgetFlag) && d->key) {
         iString str;
         init_String(&str);
@@ -251,6 +254,7 @@ void init_LabelWidget(iLabelWidget *d, const char *label, int key, int kmods, co
     d->kmods = kmods;
     init_Click(&d->click, d, !isEmpty_String(&d->command) ? SDL_BUTTON_LEFT : 0);
     setFlags_Widget(&d->widget, hover_WidgetFlag, d->click.button != 0);
+    d->alignVisual = iFalse;
     updateSize_LabelWidget(d);
 }
 
@@ -269,6 +273,10 @@ void setText_LabelWidget(iLabelWidget *d, const iString *text) {
     updateSize_LabelWidget(d);
 }
 
+void setAlignVisually_LabelWidget(iLabelWidget *d, iBool alignVisual) {
+    d->alignVisual = alignVisual;
+}
+
 void updateText_LabelWidget(iLabelWidget *d, const iString *text) {
     set_String(&d->label, text);
     refresh_Widget(&d->widget);
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index 0563728e..aee853a5 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -7,16 +7,22 @@
 iDeclareWidgetClass(LabelWidget)
 iDeclareObjectConstructionArgs(LabelWidget, const char *label, int key, int kmods, const char *command)
 
-iLocalDef iLabelWidget *newEmpty_LabelWidget(void) {
-    return new_LabelWidget("", 0, 0, NULL);
-}
-
 void    setFont_LabelWidget         (iLabelWidget *, int fontId);
 void    setText_LabelWidget         (iLabelWidget *, const iString *text); /* resizes widget */
 void    setTextCStr_LabelWidget     (iLabelWidget *, const char *text);
+void    setAlignVisually_LabelWidget(iLabelWidget *, iBool alignVisual);
 
 void    updateSize_LabelWidget      (iLabelWidget *);
 void    updateText_LabelWidget      (iLabelWidget *, const iString *text); /* not resized */
 void    updateTextCStr_LabelWidget  (iLabelWidget *, const char *text); /* not resized */
 
 const iString *command_LabelWidget  (const iLabelWidget *);
+
+iLocalDef iLabelWidget *newEmpty_LabelWidget(void) {
+    return new_LabelWidget("", 0, 0, NULL);
+}
+iLocalDef iLabelWidget *newIcon_LabelWidget(const char *label, int key, int kmods, const char *command) {
+    iLabelWidget *d = new_LabelWidget(label, key, kmods, command);
+    setAlignVisually_LabelWidget(d, iTrue);
+    return d;
+}
diff --git a/src/ui/text.c b/src/ui/text.c
index 1b483952..50b3bbab 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -23,6 +23,8 @@ iDeclareType(Font)
 iDeclareType(Glyph)
 iDeclareTypeConstructionArgs(Glyph, iChar ch)
 
+int enableHalfPixelGlyphs_Text = iTrue; /* debug setting */
+
 struct Impl_Glyph {
     iHashNode node;
     const iFont *font; /* may come from symbols/emoji */
@@ -189,7 +191,7 @@ void deinit_Text(void) {
     iRelease(d->ansiEscape);
 }
 
-iFont *font_Text_(enum iFontId id) {
+iLocalDef iFont *font_Text_(enum iFontId id) {
     return &text_.fonts[id];
 }
 
@@ -306,7 +308,13 @@ static const iGlyph *glyph_Font_(iFont *d, iChar ch) {
     return glyph;
 }
 
-enum iRunMode { measure_RunMode, measureNoWrap_RunMode, draw_RunMode, drawPermanentColor_RunMode };
+enum iRunMode {
+    measure_RunMode,
+    measureNoWrap_RunMode,
+    measureVisual_RunMode, /* actual visible bounding box of the glyph, e.g., for icons */
+    draw_RunMode,
+    drawPermanentColor_RunMode
+};
 
 static iChar nextChar_(const char **chPos, const char *end) {
     if (*chPos == end) {
@@ -322,8 +330,6 @@ static iChar nextChar_(const char **chPos, const char *end) {
     return ch;
 }
 
-int enableHalfPixelGlyphs_Text = iTrue;
-
 iLocalDef iBool isWrapBoundary_(iChar a, iChar b) {
     if (b == '/' || b == '-' || b == ',' || b == ';' || b == ':') {
         return iTrue;
@@ -331,13 +337,18 @@ iLocalDef iBool isWrapBoundary_(iChar a, iChar b) {
     return !isSpace_Char(a) && isSpace_Char(b);
 }
 
-static iInt2 run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLen, iInt2 pos,
+iLocalDef iBool isMeasuring_(enum iRunMode mode) {
+    return mode == measure_RunMode || mode == measureNoWrap_RunMode ||
+           mode == measureVisual_RunMode;
+}
+
+static iRect run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLen, iInt2 pos,
                        int xposLimit, const char **continueFrom_out, int *runAdvance_out) {
-    iInt2 size = zero_I2();
+    iRect bounds = zero_Rect();
     const iInt2 orig = pos;
     float xpos = pos.x;
     float xposMax = xpos;
-    iAssert(xposLimit == 0 || mode == measure_RunMode || mode == measureNoWrap_RunMode);
+    iAssert(xposLimit == 0 || isMeasuring_(mode));
     const char *lastWordEnd = text.start;
     if (continueFrom_out) {
         *continueFrom_out = text.end;
@@ -386,13 +397,24 @@ static iInt2 run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
             *continueFrom_out = lastWordEnd;
             break;
         }
-        size.x = iMax(size.x, x2 - orig.x);
-        size.y = iMax(size.y, pos.y + glyph->font->height - orig.y);
-        if (mode != measure_RunMode && mode != measureNoWrap_RunMode) {
-            SDL_Rect dst = { x1 + glyph->d[hoff].x,
-                             pos.y + glyph->font->baseline + glyph->d[hoff].y,
-                             glyph->rect[hoff].size.x,
-                             glyph->rect[hoff].size.y };
+        const SDL_Rect dst = { x1 + glyph->d[hoff].x,
+                               pos.y + glyph->font->baseline + glyph->d[hoff].y,
+                               glyph->rect[hoff].size.x,
+                               glyph->rect[hoff].size.y };
+        /* Update the bounding box. */
+        if (mode == measureVisual_RunMode) {
+            if (isEmpty_Rect(bounds)) {
+                bounds = init_Rect(dst.x, dst.y, dst.w, dst.h);
+            }
+            else {
+                bounds = union_Rect(bounds, init_Rect(dst.x, dst.y, dst.w, dst.h));
+            }
+        }
+        else {
+            bounds.size.x = iMax(bounds.size.x, x2 - orig.x);
+            bounds.size.y = iMax(bounds.size.y, pos.y + glyph->font->height - orig.y);
+        }
+        if (!isMeasuring_(mode)) {
             SDL_RenderCopy(text_.render, text_.cache, (const SDL_Rect *) &glyph->rect[hoff], &dst);
         }
         xpos += glyph->advance;
@@ -421,7 +443,7 @@ static iInt2 run_Font_(iFont *d, enum iRunMode mode, iRangecc text, size_t maxLe
     if (runAdvance_out) {
         *runAdvance_out = xposMax - orig.x;
     }
-    return size;
+    return bounds;
 }
 
 int lineHeight_Text(int fontId) {
@@ -439,7 +461,12 @@ iInt2 measureRange_Text(int fontId, iRangecc text) {
                      zero_I2(),
                      0,
                      NULL,
-                     NULL);
+                     NULL).size;
+}
+
+iRect visualBounds_Text(int fontId, iRangecc text) {
+    return run_Font_(
+        font_Text_(fontId), measureVisual_RunMode, text, iInvalidSize, zero_I2(), 0, NULL, NULL);
 }
 
 iInt2 measure_Text(int fontId, const char *text) {
@@ -456,7 +483,7 @@ iInt2 advanceRange_Text(int fontId, iRangecc text) {
                                  0,
                                  NULL,
                                  &advance)
-                           .y;
+                           .size.y;
     return init_I2(advance, height);
 }
 
@@ -470,7 +497,7 @@ iInt2 tryAdvance_Text(int fontId, iRangecc text, int width, const char **endPos)
                                  width,
                                  endPos,
                                  &advance)
-                           .y;
+                           .size.y;
     return init_I2(advance, height);
 }
 
@@ -484,7 +511,7 @@ iInt2 tryAdvanceNoWrap_Text(int fontId, iRangecc text, int width, const char **e
                                  width,
                                  endPos,
                                  &advance)
-                           .y;
+                           .size.y;
     return init_I2(advance, height);
 }
 
@@ -530,7 +557,7 @@ void drawAlign_Text(int fontId, iInt2 pos, int color, enum iAlignment align, con
     else if (align == right_Alignment) {
         pos.x -= measure_Text(fontId, cstr_Block(&chars)).x;
     }
-    draw_Text_(fontId, pos, color, (iRangecc){ constBegin_Block(&chars), constEnd_Block(&chars) });
+    draw_Text_(fontId, pos, color, range_Block(&chars));
     deinit_Block(&chars);
 }
 
@@ -542,7 +569,7 @@ void draw_Text(int fontId, iInt2 pos, int color, const char *text, ...) {
         vprintf_Block(&chars, text, args);
         va_end(args);
     }
-    draw_Text_(fontId, pos, color, (iRangecc){ constBegin_Block(&chars), constEnd_Block(&chars) });
+    draw_Text_(fontId, pos, color, range_Block(&chars));
     deinit_Block(&chars);
 }
 
@@ -550,7 +577,7 @@ void drawString_Text(int fontId, iInt2 pos, int color, const iString *text) {
     draw_Text_(fontId, pos, color, range_String(text));
 }
 
-void drawCentered_Text(int fontId, iRect rect, int color, const char *format, ...) {
+void drawCentered_Text(int fontId, iRect rect, iBool alignVisual, int color, const char *format, ...) {
     iBlock chars;
     init_Block(&chars, 0); {
         va_list args;
@@ -558,10 +585,11 @@ void drawCentered_Text(int fontId, iRect rect, int color, const char *format, ..
         vprintf_Block(&chars, format, args);
         va_end(args);
     }
-    const char *text = cstr_Block(&chars);
-    iInt2 textSize = advance_Text(fontId, text);
-    draw_Text_(fontId, sub_I2(mid_Rect(rect), divi_I2(textSize, 2)), color,
-               (iRangecc){ constBegin_Block(&chars), constEnd_Block(&chars) });
+    const iRangecc text       = range_Block(&chars);
+    iRect          textBounds = alignVisual ? visualBounds_Text(fontId, text)
+                                   : (iRect){ zero_I2(), advanceRange_Text(fontId, text) };
+    textBounds.pos = sub_I2(mid_Rect(rect), mid_Rect(textBounds));
+    draw_Text_(fontId, textBounds.pos, color, text);
     deinit_Block(&chars);
 }
 
diff --git a/src/ui/text.h b/src/ui/text.h
index 95d49fda..f165c5b4 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -50,6 +50,7 @@ void    deinit_Text         (void);
 int     lineHeight_Text     (int fontId);
 iInt2   measure_Text        (int fontId, const char *text);
 iInt2   measureRange_Text   (int fontId, iRangecc text);
+iRect   visualBounds_Text   (int fontId, iRangecc text);
 iInt2   advance_Text        (int fontId, const char *text);
 iInt2   advanceN_Text       (int fontId, const char *text, size_t n); /* `n` in characters */
 iInt2   advanceRange_Text   (int fontId, iRangecc text);
@@ -65,7 +66,7 @@ enum iAlignment {
 
 void    draw_Text           (int fontId, iInt2 pos, int color, const char *text, ...);
 void    drawAlign_Text      (int fontId, iInt2 pos, int color, enum iAlignment align, const char *text, ...);
-void    drawCentered_Text   (int fontId, iRect rect, int color, const char *text, ...);
+void    drawCentered_Text   (int fontId, iRect rect, iBool alignVisual, int color, const char *text, ...);
 void    drawString_Text     (int fontId, iInt2 pos, int color, const iString *text);
 
 SDL_Texture *   glyphCache_Text     (void);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 10e24678..7208a755 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -32,6 +32,7 @@ enum iWidgetFlag {
     frameless_WidgetFlag         = iBit(8),
     drawKey_WidgetFlag           = iBit(10),
     focusable_WidgetFlag         = iBit(11),
+    tight_WidgetFlag             = iBit(31), /* smaller padding */
     keepOnTop_WidgetFlag         = iBit(12), /* gets events first; drawn last */
     arrangeHorizontal_WidgetFlag = iBit(17), /* arrange children horizontally */
     arrangeVertical_WidgetFlag   = iBit(18), /* arrange children vertically */