Flag for tight label padding; aligning labels visually

1 files changed, 6 insertions, 5 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;