summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2006-03-26 19:59:15 +0000
committerJames Bursa <james@netsurf-browser.org>2006-03-26 19:59:15 +0000
commitc2bddcee466653f0739797be94fbcdc12614dabc (patch)
tree05ab1e31fbfdc5c70d550c3651fd020fa70bccd3
parent8ebdc30958313c9fccc8b11e2f6aa9e033aab032 (diff)
downloadnetsurf-c2bddcee466653f0739797be94fbcdc12614dabc.tar.gz
netsurf-c2bddcee466653f0739797be94fbcdc12614dabc.tar.bz2
[project @ 2006-03-26 19:59:15 by bursa]
Fix layout bug related to floats near end of line (fixes 1453561). Pass 1 and pass 2 in layout_line() were handling space_after differently. svn path=/import/netsurf/; revision=2182
-rw-r--r--render/layout.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/render/layout.c b/render/layout.c
index 7df848f0a..0f97ff113 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -1063,14 +1063,14 @@ bool layout_line(struct box *first, int width, int *y,
b->type == BOX_BR || b->type == BOX_TEXT ||
b->type == BOX_INLINE_END);
- x += space_after;
-
if (b->type == BOX_BR)
break;
if (b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT)
continue;
+ x += space_after;
+
if (b->type == BOX_INLINE_BLOCK) {
if (b->width == UNKNOWN_WIDTH)
if (!layout_float(b, width, content))