summaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-11-04 19:55:24 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2012-11-04 19:55:24 +0000
commit2dcfcd6724da83fe5ee944cdb6f371f1e52d4fa8 (patch)
treeb3ce301aed06c8e16e05c0e5820dd277e7254079 /render
parentaa438d34d2c5e99ceff437deeb50adf182399ee4 (diff)
downloadnetsurf-2dcfcd6724da83fe5ee944cdb6f371f1e52d4fa8.tar.gz
netsurf-2dcfcd6724da83fe5ee944cdb6f371f1e52d4fa8.tar.bz2
Fix placement of first inline on line below a float, when float has been shifted up by >= its own height with a negative margin.
Diffstat (limited to 'render')
-rw-r--r--render/layout.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/render/layout.c b/render/layout.c
index d0e3debe0..702cc03c6 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -2782,7 +2782,10 @@ bool layout_line(struct box *first, int *width, int *y,
if (right && used_height <
right->y + right->height - cy + 1)
used_height = right->y + right->height - cy + 1;
- assert(0 < used_height);
+
+ if (used_height < 0)
+ used_height = 0;
+
b = split_box;
#ifdef LAYOUT_DEBUG
LOG(("moving below float"));