summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-01-26 15:14:38 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-01-26 15:14:38 +0000
commit44e8897a482c71a02e2e37543c253a862d25f0d8 (patch)
treefeba7b6c1ac39c1ec8092141850e50a527e0b3bc /render
parent80cdf73f6b5f4893490b7dafe876b8cd1ae232b7 (diff)
downloadnetsurf-44e8897a482c71a02e2e37543c253a862d25f0d8.tar.gz
netsurf-44e8897a482c71a02e2e37543c253a862d25f0d8.tar.bz2
Make layout of block formatting contexts take account of the bottom margin of the last contained block.
svn path=/trunk/netsurf/; revision=11498
Diffstat (limited to 'render')
-rw-r--r--render/layout.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/render/layout.c b/render/layout.c
index 52f5d1ac2..9445b4327 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -621,6 +621,9 @@ bool layout_block_context(struct box *block, int viewport_height,
margin_box = box;
}
+ /* Account for bottom margin of last contained block */
+ cy += max_pos_margin - max_neg_margin;
+
/* Increase height to contain any floats inside (CSS 2.1 10.6.7). */
for (box = block->float_children; box; box = box->next_float) {
y = box->y + box->height + box->padding[BOTTOM] +