3 files changed, 53 insertions, 12 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index f23091d8..0555bc4d 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -166,10 +166,10 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
 static void draw_LabelWidget_(const iLabelWidget *d) {
     const iWidget *w = constAs_Widget(d);
     draw_Widget(w);
-    const iBool isButton = d->click.button != 0;
-    const int   flags    = flags_Widget(w);
-    const iRect bounds   = bounds_Widget(w);
-    iRect       rect     = bounds;
+    const iBool   isButton = d->click.button != 0;
+    const int64_t flags    = flags_Widget(w);
+    const iRect   bounds   = bounds_Widget(w);
+    iRect         rect     = bounds;
     if (isButton) {
         shrink_Rect(&rect, divi_I2(gap2_UI, 4));
         adjustEdges_Rect(&rect, gap_UI / 8, 0, -gap_UI / 8, 0);
@@ -196,7 +196,12 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
         }
     }
     setClip_Paint(&p, rect);
-    if (flags & alignLeft_WidgetFlag) {
+    if (flags & wrapText_WidgetFlag) {
+        const iRect inner = innerBounds_Widget(w);
+        const int   wrap  = inner.size.x;
+        drawWrapRange_Text(d->font, topLeft_Rect(inner), wrap, fg, range_String(&d->label));
+    }
+    else if (flags & alignLeft_WidgetFlag) {
         draw_Text(d->font, add_I2(bounds.pos, padding_(flags)), fg, cstr_String(&d->label));
         if ((flags & drawKey_WidgetFlag) && d->key) {
             iString str;
@@ -235,7 +240,8 @@ void updateSize_LabelWidget(iLabelWidget *d) {
         size.x += 2 * gap_UI + measure_Text(uiShortcuts_FontId, cstr_String(&str)).x;
         deinit_String(&str);
     }
-    if (~flags & fixedWidth_WidgetFlag) {
+    /* Wrapped text implies that width must be defined by arrangement. */
+    if (!(flags & (fixedWidth_WidgetFlag | wrapText_WidgetFlag))) {
         w->rect.size.x = size.x;
     }
     if (~flags & fixedHeight_WidgetFlag) {
@@ -243,6 +249,18 @@ void updateSize_LabelWidget(iLabelWidget *d) {
     }
 }
 
+static void sizeChanged_LabelWidget_(iLabelWidget *d) {
+    iWidget *w = as_Widget(d);
+    if (flags_Widget(w) & wrapText_WidgetFlag) {
+        if (flags_Widget(w) & fixedHeight_WidgetFlag) {
+            /* Calculate a new height based on the wrapping. */
+            w->rect.size.y = advanceWrapRange_Text(
+                                 d->font, innerBounds_Widget(w).size.x, range_String(&d->label))
+                                 .y;
+        }
+    }
+}
+
 void init_LabelWidget(iLabelWidget *d, const char *label, int key, int kmods, const char *cmd) {
     init_Widget(&d->widget);
     d->font = uiLabel_FontId;
@@ -312,4 +330,5 @@ iLabelWidget *newColor_LabelWidget(const char *text, int color) {
 iBeginDefineSubclass(LabelWidget, Widget)
     .processEvent = (iAny *) processEvent_LabelWidget_,
     .draw         = (iAny *) draw_LabelWidget_,
+   .sizeChanged   = (iAny *) sizeChanged_LabelWidget_,
 iEndDefineSubclass(LabelWidget)
diff --git a/src/ui/widget.c b/src/ui/widget.c
index ea2e3fe2..d10d73e1 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -65,6 +65,10 @@ void destroyPending_Widget(void) {
     }
 }
 
+void releaseChildren_Widget(iWidget *d) {
+    iReleasePtr(&d->children);
+}
+
 iDefineObjectConstruction(Widget)
 
 void init_Widget(iWidget *d) {
@@ -80,7 +84,7 @@ void init_Widget(iWidget *d) {
 }
 
 void deinit_Widget(iWidget *d) {
-    iReleasePtr(&d->children);
+    releaseChildren_Widget(d);
     deinit_String(&d->id);
 }
 
@@ -191,14 +195,29 @@ static int widestChild_Widget_(const iWidget *d) {
 static void setWidth_Widget_(iWidget *d, int width) {
     iAssert(width >= 0);
     if (~d->flags & fixedWidth_WidgetFlag || d->flags & collapse_WidgetFlag) {
-        d->rect.size.x = width;
+        if (d->rect.size.x != width) {
+            d->rect.size.x = width;
+            if (class_Widget(d)->sizeChanged) {
+                const int oldHeight = d->rect.size.y;
+                class_Widget(d)->sizeChanged(d);
+                if (d->rect.size.y != oldHeight) {
+                    /* Widget updated its height. */
+                    arrange_Widget(d->parent);
+                }
+            }
+        }
     }
 }
 
 static void setHeight_Widget_(iWidget *d, int height) {
     iAssert(height >= 0);
     if (~d->flags & fixedHeight_WidgetFlag || d->flags & collapse_WidgetFlag) {
-        d->rect.size.y = height;
+        if (d->rect.size.y != height) {
+            d->rect.size.y = height;
+            if (class_Widget(d)->sizeChanged) {
+                class_Widget(d)->sizeChanged(d);
+            }
+        }
     }
 }
 
@@ -274,7 +293,7 @@ void arrange_Widget(iWidget *d) {
             iWidget *child = as_Widget(c.object);
             if (isCollapsed_Widget_(child)) {
                 if (d->flags & arrangeHorizontal_WidgetFlag) {
-                    setWidth_Widget_(child, 0);
+                    setWidth_Widget_(child, 0);                    
                 }
                 if (d->flags & arrangeVertical_WidgetFlag) {
                     setHeight_Widget_(child, 0);
diff --git a/src/ui/widget.h b/src/ui/widget.h
index a1a38f28..fd7ee316 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -41,6 +41,7 @@ iDeclareType(Widget)
 iBeginDeclareClass(Widget)
     iBool (*processEvent)   (iWidget *, const SDL_Event *);
     void  (*draw)           (const iWidget *);
+    void  (*sizeChanged)    (iWidget *); /* optional, defaults to NULL */
 iEndDeclareClass(Widget)
 
 enum iWidgetFlag {
@@ -85,6 +86,7 @@ enum iWidgetFlag {
 #define wasCollapsed_WidgetFlag             iBit64(32)
 #define centerHorizontal_WidgetFlag         iBit64(33)
 #define moveToParentRightEdge_WidgetFlag    iBit64(34)
+#define wrapText_WidgetFlag                 iBit64(35)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
@@ -131,8 +133,9 @@ iLocalDef const iWidget *constAs_Widget(const iAnyObject *d) {
     return (const iWidget *) d;
 }
 
-void    destroy_Widget      (iWidget *); /* widget removed and deleted later */
-void    destroyPending_Widget(void);
+void    destroy_Widget          (iWidget *); /* widget removed and deleted later */
+void    destroyPending_Widget   (void);
+void    releaseChildren_Widget  (iWidget *);
 
 const iString *id_Widget    (const iWidget *);
 int64_t flags_Widget        (const iWidget *);