Widget: Fixed arrangement resetting

The expand flag should be reset only in the context of the parent's arrangement/resize direction.

1 files changed, 6 insertions, 3 deletions

diff --git a/src/ui/widget.c b/src/ui/widget.c
index 23c701e4..475e7c1f 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -725,12 +725,15 @@ static void resetArrangement_Widget_(iWidget *d) {
             if (d->flags & arrangeHorizontal_WidgetFlag) {
                 child->rect.pos.x = 0;
             }
+            if (d->flags & resizeWidthOfChildren_WidgetFlag && child->flags & expand_WidgetFlag) {
+                child->rect.size.x = 0;
+            }
             if (d->flags & arrangeVertical_WidgetFlag) {
                 child->rect.pos.y = 0;
             }
-        }
-        if (child->flags & expand_WidgetFlag) {
-            child->rect = zero_Rect();
+            if (d->flags & resizeHeightOfChildren_WidgetFlag && child->flags & expand_WidgetFlag) {
+                child->rect.size.y = 0;
+            }
         }
     }
 }