From 745d4b1d67b627306a1d04f31b1fe085460fd005 Mon Sep 17 00:00:00 2001 From: James Bursa Date: Thu, 27 May 2004 23:45:26 +0000 Subject: [project @ 2004-05-27 23:45:26 by bursa] Table and float bug fixes. svn path=/import/netsurf/; revision=899 --- render/layout.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/render/layout.c b/render/layout.c index 16f59fc12..35e9560ed 100644 --- a/render/layout.c +++ b/render/layout.c @@ -1202,8 +1202,10 @@ void layout_table(struct box *table, int available_width) for (i = 0; i != columns; i++) { if (col[i].type == COLUMN_WIDTH_RELATIVE) relative_sum += col[i].width; - else + else if (col[i].type == COLUMN_WIDTH_FIXED) spare_width -= col[i].width; + else + spare_width -= col[i].min; } if (spare_width < 0) spare_width = 0; @@ -1494,7 +1496,8 @@ void calculate_inline_container_widths(struct box *box) case BOX_FLOAT_LEFT: case BOX_FLOAT_RIGHT: - calculate_block_widths(child, &min, &max, 0); + calculate_block_widths(child->children, + &min, &max, 0); break; case BOX_BR: -- cgit v1.2.3