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

Include top margin when finding sides for block formatting contexts.

Browse Source 
svn path=/trunk/netsurf/; revision=6293
This commit is contained in:
Michael Drake 2009-01-29 21:23:48 +00:00
parent ab3da70659
commit 56b48410be
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
render/layout.c
View File

@ -325,7 +325,30 @@ bool layout_block_context(struct box *block, struct content *content)
if (box->style && box->style->clear != CSS_CLEAR_NONE)
y = layout_clear(block->float_children,
box->style->clear);
/* no /required/ margins if box doesn't establisha new block
/* Get top margin */
switch (box->style->margin[TOP].margin) {
case CSS_MARGIN_LENGTH:
box->margin[TOP] = css_len2px(&box->style->margin[TOP].
value.length, box->style);
break;
case CSS_MARGIN_PERCENT:
box->margin[TOP] = box->parent->width *
box->style->margin[TOP].value.percent /
100;
break;
case CSS_MARGIN_AUTO:
default:
box->margin[TOP] = 0;
break;
}
if (max_pos_margin < box->margin[TOP])
max_pos_margin = box->margin[TOP];
else if (max_neg_margin < -box->margin[TOP])
max_neg_margin = -box->margin[TOP];
/* no /required/ margins if box doesn't establish a new block
* formatting context */
lm = rm = 0;
@ -339,6 +362,7 @@ bool layout_block_context(struct box *block, struct content *content)
int x0, x1, top;
struct box *left, *right;
top = cy > y ? cy : y;
top += max_pos_margin - max_neg_margin;
x0 = cx;
x1 = cx + box->parent->width -
box->parent->padding[LEFT] -
@ -364,6 +388,7 @@ bool layout_block_context(struct box *block, struct content *content)
int x0, x1, top;
struct box *left, *right;
top = cy > y ? cy : y;
top += max_pos_margin - max_neg_margin;
x0 = cx;
x1 = cx + box->parent->width -
box->parent->padding[LEFT] -
@ -391,12 +416,7 @@ bool layout_block_context(struct box *block, struct content *content)
box->border[LEFT];
cx += box->x;
/* Position box: top margin. */
if (max_pos_margin < box->margin[TOP])
max_pos_margin = box->margin[TOP];
else if (max_neg_margin < -box->margin[TOP])
max_neg_margin = -box->margin[TOP];
/* Position box: vertical. */
if (box->type != BOX_BLOCK || y ||
box->border[TOP] || box->padding[TOP]) {
margin_box->y += max_pos_margin - max_neg_margin;