LabelWidget: Implicit minimum size

3 files changed, 7 insertions, 5 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 45c02827..6847ddf1 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -391,6 +391,7 @@ void updateSize_LabelWidget(iLabelWidget *d) {
     iWidget *w = as_Widget(d);
     const int64_t flags = flags_Widget(w);
     const iInt2 size = defaultSize_LabelWidget(d);
+    w->minSize.y = size.y; /* vertically text must remain visible */
     /* Wrapped text implies that width must be defined by arrangement. */
     if (!(flags & (fixedWidth_WidgetFlag | wrapText_WidgetFlag))) {
         w->rect.size.x = size.x;
@@ -405,7 +406,8 @@ static void replaceVariables_LabelWidget_(iLabelWidget *d) {
 }
 
 void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
-    init_Widget(&d->widget);
+    iWidget *w = &d->widget;
+    init_Widget(w);
     d->font = uiLabel_FontId;
     d->forceFg = none_ColorId;
     d->icon = 0;
@@ -416,13 +418,13 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
         initCStr_String(&d->command, cmd);
     }
     else {
-        setFrameColor_Widget(&d->widget, uiFrame_ColorId);
+        setFrameColor_Widget(w, uiFrame_ColorId);
         init_String(&d->command);
     }
     d->key   = 0;
     d->kmods = 0;
     init_Click(&d->click, d, !isEmpty_String(&d->command) ? SDL_BUTTON_LEFT : 0);
-    setFlags_Widget(&d->widget, hover_WidgetFlag, d->click.button != 0);
+    setFlags_Widget(w, hover_WidgetFlag, d->click.button != 0);
     d->alignVisual = iFalse;
     updateSize_LabelWidget(d);
     updateKey_LabelWidget_(d); /* could be bound to another key */
diff --git a/src/ui/root.c b/src/ui/root.c
index 287b641e..35eb84ef 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -305,6 +305,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "splitmenu.open")) {
+        setFocus_Widget(NULL);
         iWidget *menu = findWidget_Root("splitmenu");
         openMenu_Widget(menu, zero_I2());
         setPos_Widget(menu, sub_I2(divi_I2(size_Root(get_Root()), 2), divi_I2(menu->rect.size, 2)));
diff --git a/src/ui/util.c b/src/ui/util.c
index 7bc611e0..9927b79f 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2061,7 +2061,6 @@ static iWidget *appendTwoColumnPage_(iWidget *tabs, const char *title, int short
                                      iWidget **values) {
     /* TODO: Use `makeTwoColumnWidget_()`, see above. */
     iWidget *page = new_Widget();
-    setBackgroundColor_Widget(page, red_ColorId);
     setFlags_Widget(page, arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
     addChildFlags_Widget(page, iClob(new_Widget()), expand_WidgetFlag);
     setPadding_Widget(page, 0, gap_UI, 0, gap_UI);
@@ -2438,7 +2437,7 @@ iWidget *makePreferences_Widget(void) {
                         (iMenuItem[]){ { "${dismiss}", SDLK_ESCAPE, 0, "prefs.dismiss" } }, 1)));
     addChild_Widget(dlg->root->widget, iClob(dlg));
     finalizeSheet_Widget(dlg);
-    //printTree_Widget(dlg);
+//    printTree_Widget(dlg);
     return dlg;
 }