Commit 3e334165 authored by Cedric Roux's avatar Cedric Roux

fix container size allocation

parent 078b4ab9
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#define MAX(a, b) ((a)>(b)?(a):(b))
static void repack(gui *g, widget *_this) static void repack(gui *g, widget *_this)
{ {
printf("REPACK container %p\n", _this); printf("REPACK container %p\n", _this);
...@@ -84,7 +86,7 @@ hints_ok: ...@@ -84,7 +86,7 @@ hints_ok:
l->item->hints(g, l->item, &cwidth, &cheight); l->item->hints(g, l->item, &cwidth, &cheight);
l->item->allocate(g, l->item, this->common.x, this->common.y + cy, l->item->allocate(g, l->item, this->common.x, this->common.y + cy,
//this->hint_width, cheight); //this->hint_width, cheight);
width, cheight); MAX(width, cwidth), cheight);
cy += cheight; cy += cheight;
l = l->next; l = l->next;
} }
...@@ -118,7 +120,7 @@ hints_ok: ...@@ -118,7 +120,7 @@ hints_ok:
while (l) { while (l) {
l->item->hints(g, l->item, &cwidth, &cheight); l->item->hints(g, l->item, &cwidth, &cheight);
l->item->allocate(g, l->item, this->common.x + cx, this->common.y, l->item->allocate(g, l->item, this->common.x + cx, this->common.y,
cwidth, this->hint_height); cwidth, MAX(height, cheight)/* this->hint_height */);
cx += cwidth; cx += cwidth;
l = l->next; l = l->next;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment