#1437 - Fix sizing logic for widgets and textboxes. (#1444)

* [I1437] Textbox make get_desired_width depend on width.

Should fix some weird sizing issues on creation of widgest.


* [i1437] [View] Do the sizing based on the desired window width.

issue: #1437

* [i1437] Fix header documentation.

1 files changed, 10 insertions, 9 deletions

diff --git a/source/widgets/box.c b/source/widgets/box.c
index d1d05ab8..1b5e2933 100644
--- a/source/widgets/box.c
+++ b/source/widgets/box.c
@@ -49,7 +49,7 @@ struct _box {
 
 static void box_update(widget *wid);
 
-static int box_get_desired_width(widget *wid) {
+static int box_get_desired_width(widget *wid, const int height) {
   box *b = (box *)wid;
   int spacing = distance_get_pixel(b->spacing, b->type);
   int width = 0;
@@ -71,10 +71,10 @@ static int box_get_desired_width(widget *wid) {
       }
       active_widgets++;
       if (child->expand == TRUE) {
-        width += widget_get_desired_width(child);
+        width += widget_get_desired_width(child, height);
         continue;
       }
-      width += widget_get_desired_width(child);
+      width += widget_get_desired_width(child, height);
     }
     if (active_widgets > 0) {
       width += (active_widgets - 1) * spacing;
@@ -86,13 +86,13 @@ static int box_get_desired_width(widget *wid) {
       if (!child->enabled) {
         continue;
       }
-      width = MAX(widget_get_desired_width(child), width);
+      width = MAX(widget_get_desired_width(child, height), width);
     }
   }
   width += widget_padding_get_padding_width(wid);
   return width;
 }
-static int box_get_desired_height(widget *wid) {
+static int box_get_desired_height(widget *wid, const int width) {
   box *b = (box *)wid;
   int spacing = distance_get_pixel(b->spacing, b->type);
   int height = 0;
@@ -105,7 +105,7 @@ static int box_get_desired_height(widget *wid) {
         continue;
       }
       active_widgets++;
-      height += widget_get_desired_height(child);
+      height += widget_get_desired_height(child, width);
     }
     if (active_widgets > 0) {
       height += (active_widgets - 1) * spacing;
@@ -117,7 +117,7 @@ static int box_get_desired_height(widget *wid) {
       if (!child->enabled) {
         continue;
       }
-      height = MAX(widget_get_desired_height(child), height);
+      height = MAX(widget_get_desired_height(child, width), height);
     }
   }
   height += widget_padding_get_padding_height(wid);
@@ -134,7 +134,8 @@ static void vert_calculate_size(box *b) {
        iter = g_list_next(iter)) {
     widget *child = (widget *)iter->data;
     if (child->enabled && child->expand == FALSE) {
-      widget_resize(child, rem_width, widget_get_desired_height(child));
+      widget_resize(child, rem_width,
+                    widget_get_desired_height(child, rem_width));
     }
   }
   b->max_size = 0;
@@ -201,7 +202,7 @@ static void hori_calculate_size(box *b) {
     widget *child = (widget *)iter->data;
     if (child->enabled && child->expand == FALSE) {
       widget_resize(child,
-                    widget_get_desired_width(child), // child->w,
+                    widget_get_desired_width(child, rem_height), // child->w,
                     rem_height);
     }
   }