From 8124d3d5ad0e83b1f0b26796cf84e8fa4b563a66 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sun, 24 Aug 2008 18:55:55 +0000 Subject: Possibly fix BeOS / AmigaOS layout assert on line 190 for particular pages. svn path=/trunk/netsurf/; revision=5197 --- render/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/render/layout.c b/render/layout.c index 252b17429..492b4aa01 100644 --- a/render/layout.c +++ b/render/layout.c @@ -345,7 +345,7 @@ bool layout_block_context(struct box *block, struct content *content) /* Unless the box has an overflow style of visible, the box * establishes a new block context. */ - if (box->type != BOX_INLINE_CONTAINER && box->style && + if (box->type == BOX_BLOCK && box->style && box->style->overflow != CSS_OVERFLOW_VISIBLE) { cy += max_pos_margin - max_neg_margin; box->y += max_pos_margin - max_neg_margin; @@ -1254,7 +1254,7 @@ bool layout_line(struct box *first, int *width, int *y, gadget_size.unit = CSS_UNIT_EM; gadget_size.value = 1; - + LOG(("first %p, first->text '%.*s', width %i, y %i, cx %i, cy %i", first, (int) first->length, first->text, *width, *y, cx, cy)); -- cgit v1.2.3