LabelWidget: Flag for wrapping text

Widgets now have an optional virtual method that gets called when the size of the widget changes during arranging. Wrapped text in LabelWidget uses this to update its height.

1 files changed, 23 insertions, 4 deletions

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);