mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 01:09:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Make blocks which establish a new block formatting context use have the correct width and position to avoid overlapping floats. Fixes the main problem on the amazon.co.uk front page.

Browse Source 
svn path=/trunk/netsurf/; revision=6142
This commit is contained in:
Michael Drake 2009-01-18 23:41:48 +00:00
parent ddd59deaf2
commit 20120a8acf
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
render/layout.c
View File

@ -364,9 +364,26 @@ bool layout_block_context(struct box *block, struct content *content)
* establishes a new block context. */ * establishes a new block context. */
if (box->type == BOX_BLOCK && box->style && if (box->type == BOX_BLOCK && box->style &&
box->style->overflow != CSS_OVERFLOW_VISIBLE) { box->style->overflow != CSS_OVERFLOW_VISIBLE) {
int x0, x1;
struct box *left, *right;
cy += max_pos_margin - max_neg_margin; cy += max_pos_margin - max_neg_margin;
box->y += max_pos_margin - max_neg_margin; box->y += max_pos_margin - max_neg_margin;
/* Before calling layout_block_context, find the
* available width */
x0 = cx;
x1 = cx + box->parent->width;
find_sides(block->float_children, cy, cy, &x0, &x1,
&left, &right);
box->x += x0 - cx;
x1 = box->parent->width - x1 + x0;
if (box->width - x1 > 0)
box->width -= x1;
else
box->width = 0;
cx = x0;
layout_block_context(box, content); layout_block_context(box, content);
if (box->type == BOX_BLOCK || box->object) if (box->type == BOX_BLOCK || box->object)