mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-24 04:56:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Establish a new block formatting context for blocks with non-visisble overflow style. (9.4.1)

Browse Source 
svn path=/trunk/netsurf/; revision=4270
This commit is contained in:
Michael Drake 2008-06-06 14:54:19 +00:00
parent b2cbb513fa
commit 243e0abbcd
1 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
render/layout.c
View File

@ -290,6 +290,9 @@ bool layout_block_context(struct box *block, struct content *content)
(box->style->position == CSS_POSITION_ABSOLUTE||
box->style->position == CSS_POSITION_FIXED)) {
box->x = box->parent->padding[LEFT];
/* absolute positioned; this element will establish
* its own block context when it gets laid out later,
* so no need to look at its children now. */
goto advance_to_next_box;
}
@ -335,6 +338,36 @@ bool layout_block_context(struct box *block, struct content *content)
}
}
/* Unless the box has an overflow style of visible, the box
* establishes a new block context. */
if (box->type != BOX_INLINE_CONTAINER && box->style &&
box->style->overflow != CSS_OVERFLOW_VISIBLE) {
layout_block_context(box, content);
if (box->type == BOX_BLOCK || box->object)
cy += box->padding[TOP];
if (box->type == BOX_BLOCK && box->height == AUTO) {
box->height = 0;
layout_block_add_scrollbar(box, BOTTOM);
}
cy += box->height + box->padding[BOTTOM] +
box->border[BOTTOM];
max_pos_margin = max_neg_margin = 0;
if (max_pos_margin < box->margin[BOTTOM])
max_pos_margin = box->margin[BOTTOM];
else if (max_neg_margin < -box->margin[BOTTOM])
max_neg_margin = -box->margin[BOTTOM];
cx -= box->x;
y = box->y + box->padding[TOP] + box->height +
box->padding[BOTTOM] +
box->border[BOTTOM];
/* Skip children, because they are done in the new
* block context */
goto advance_to_next_box;
}
LOG(("box %p, cx %i, cy %i", box, cx, cy));
/* Layout (except tables). */