LabelWidget: Option to disable min height

Sizing of the embedded indicators in the URL bar requires smaller than default minimum height.

3 files changed, 20 insertions, 4 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 6847ddf1..e4ab378d 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -39,8 +39,11 @@ struct Impl_LabelWidget {
     iChar   icon;
     int     forceFg;
     iString command;
-    iBool   alignVisual; /* align according to visible bounds, not font metrics */
     iClick  click;
+    struct {
+        uint8_t alignVisual     : 1; /* align according to visible bounds, not font metrics */
+        uint8_t noAutoMinHeight : 1; /* minimum height is not set automatically */
+    } flags;
 };
 
 static iInt2 padding_LabelWidget_(const iLabelWidget *d, int corner) {
@@ -339,7 +342,7 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
                           adjusted_Rect(bounds,
                                         add_I2(zero_I2(), init_I2(iconPad, 0)),
                                         neg_I2(zero_I2())),
-                          d->alignVisual,
+                          d->flags.alignVisual,
                           fg,
                           "%s",
                           cstr_String(&d->label));
@@ -425,7 +428,8 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
     d->kmods = 0;
     init_Click(&d->click, d, !isEmpty_String(&d->command) ? SDL_BUTTON_LEFT : 0);
     setFlags_Widget(w, hover_WidgetFlag, d->click.button != 0);
-    d->alignVisual = iFalse;
+    d->flags.alignVisual = iFalse;
+    d->flags.noAutoMinHeight = iFalse;
     updateSize_LabelWidget(d);
     updateKey_LabelWidget_(d); /* could be bound to another key */
 }
@@ -454,7 +458,15 @@ void setText_LabelWidget(iLabelWidget *d, const iString *text) {
 }
 
 void setAlignVisually_LabelWidget(iLabelWidget *d, iBool alignVisual) {
-    d->alignVisual = alignVisual;
+    d->flags.alignVisual = alignVisual;
+}
+
+void setNoAutoMinHeight_LabelWidget(iLabelWidget *d, iBool noAutoMinHeight) {
+    /* By default all labels use a minimum height determined by the text dimensions. */
+    d->flags.noAutoMinHeight = noAutoMinHeight;
+    if (noAutoMinHeight) {
+        d->widget.minSize.y = 0;
+    }
 }
 
 void updateText_LabelWidget(iLabelWidget *d, const iString *text) {
diff --git a/src/ui/labelwidget.h b/src/ui/labelwidget.h
index f4c4658c..e38a1dc8 100644
--- a/src/ui/labelwidget.h
+++ b/src/ui/labelwidget.h
@@ -30,6 +30,7 @@ iDeclareWidgetClass(LabelWidget)
 iDeclareObjectConstructionArgs(LabelWidget, const char *label, const char *command)
 
 void    setAlignVisually_LabelWidget(iLabelWidget *, iBool alignVisual);
+void    setNoAutoMinHeight_LabelWidget(iLabelWidget *, iBool noAutoMinHeight);
 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 3661229e..cd6959c4 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1020,6 +1020,7 @@ void createUserInterface_Root(iRoot *d) {
                 setBackgroundColor_Widget(as_Widget(queryInd), uiBackground_ColorId);
                 setFrameColor_Widget(as_Widget(queryInd), uiTextAction_ColorId);
                 setAlignVisually_LabelWidget(queryInd, iTrue);
+                setNoAutoMinHeight_LabelWidget(queryInd, iTrue);
                 addChildFlags_Widget(rightEmbed,
                                      iClob(queryInd),
                                      collapse_WidgetFlag | hidden_WidgetFlag);
@@ -1030,6 +1031,7 @@ void createUserInterface_Root(iRoot *d) {
                 setId_Widget(as_Widget(fprog), "feeds.progress");
                 setBackgroundColor_Widget(as_Widget(fprog), uiBackground_ColorId);
                 setAlignVisually_LabelWidget(fprog, iTrue);
+                setNoAutoMinHeight_LabelWidget(fprog, iTrue);
                 addChildFlags_Widget(rightEmbed,
                                      iClob(fprog),
                                      collapse_WidgetFlag | frameless_WidgetFlag | hidden_WidgetFlag);
@@ -1039,6 +1041,7 @@ void createUserInterface_Root(iRoot *d) {
                 setId_Widget(as_Widget(progress), "document.progress");
                 setBackgroundColor_Widget(as_Widget(progress), uiBackground_ColorId);
                 setAlignVisually_LabelWidget(progress, iTrue);
+                setNoAutoMinHeight_LabelWidget(progress, iTrue);
                 addChildFlags_Widget(
                     rightEmbed, iClob(progress), collapse_WidgetFlag);
             }