mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix placement of tables in normal flow next to floats. This stops big blank gaps appearing e.g. at the top of wikipedia articles, on some google search results and on amazon product pages. 

svn path=/trunk/netsurf/; revision=6162
This commit is contained in:
Michael Drake 2009-01-21 23:01:59 +00:00
parent 9134956efe
commit 4c40bbc096
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
render/layout.c
View File

@ -344,7 +344,16 @@ bool layout_block_context(struct box *block, struct content *content)
layout_block_add_scrollbar(box, RIGHT);
layout_block_add_scrollbar(box, BOTTOM);
} else if (box->type == BOX_TABLE) {
if (!layout_table(box, box->parent->width, content))
if (box->style->width.width == CSS_WIDTH_AUTO) {
int x0, x1;
struct box *left, *right;
x0 = cx;
x1 = cx + box->parent->width;
find_sides(block->float_children, cy, cy,
&x0, &x1, &left, &right);
available_width = x1 - x0 > 0 ? x1 - x0 : 0;
}
if (!layout_table(box, available_width, content))
return false;
layout_solve_width(box->parent->width, box->width,
-1, -1, box->margin, box->padding,
@ -438,6 +447,8 @@ bool layout_block_context(struct box *block, struct content *content)
find_sides(block->float_children, y,
y + box->height,
&x0, &x1, &left, &right);
if (box->style->width.width == CSS_WIDTH_AUTO)
break;
if (box->width <= x1 - x0)
break;
if (!left && !right)