diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2007-03-24 21:03:36 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2007-03-24 21:03:36 +0000 |
| commit | 5e0bec495c84b738d944ea19a59c68becee0cca7 (patch) | |
| tree | 2e5b63e619867af77804dabf7cdc3ecd0fd79c19 /render | |
| parent | 91cfb115927f43fa6dc90ae9c4abdb0ed767ccb7 (diff) | |
| download | netsurf-5e0bec495c84b738d944ea19a59c68becee0cca7.tar.gz netsurf-5e0bec495c84b738d944ea19a59c68becee0cca7.tar.bz2 | |
Fix FP exception when right-aligned tables with margin: auto are nested
(interaction with floats, resulting in margin[TOP] == AUTO) (fixes
1662931)
svn path=/trunk/netsurf/; revision=3218
Diffstat (limited to 'render')
| -rw-r--r-- | render/layout.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/render/layout.c b/render/layout.c index b305747f7..5215c899b 100644 --- a/render/layout.c +++ b/render/layout.c @@ -1273,6 +1273,7 @@ bool layout_line(struct box *first, int *width, int *y, if (!layout_float(d, *width, content)) return false; + LOG(("%p : %d %d", d, d->margin[TOP], d->border[TOP])); d->x = d->margin[LEFT] + d->border[LEFT]; d->y = d->margin[TOP] + d->border[TOP]; b->width = d->margin[LEFT] + d->border[LEFT] + @@ -1717,6 +1718,10 @@ bool layout_float(struct box *b, int width, struct content *content) b->margin[LEFT] = 0; if (b->margin[RIGHT] == AUTO) b->margin[RIGHT] = 0; + if (b->margin[TOP] == AUTO) + b->margin[TOP] = 0; + if (b->margin[BOTTOM] == AUTO) + b->margin[BOTTOM] = 0; } else return layout_block_context(b, content); return true; |