From 57b68bd9332f4c1636073ab8dd10a3ce50a173cf Mon Sep 17 00:00:00 2001 From: James Bursa Date: Sun, 5 Jun 2005 20:54:37 +0000 Subject: [project @ 2005-06-05 20:54:37 by bursa] More work on borders / padding / margins on inline elements. Add BOX_INLINE_END to hold the right border / padding / margin (left is in the BOX_INLINE). svn path=/import/netsurf/; revision=1742 --- render/box_normalise.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'render/box_normalise.c') diff --git a/render/box_normalise.c b/render/box_normalise.c index c67fe285d..22971af8c 100644 --- a/render/box_normalise.c +++ b/render/box_normalise.c @@ -110,6 +110,7 @@ bool box_normalise_block(struct box *block, struct content *c) return false; break; case BOX_INLINE: + case BOX_INLINE_END: case BOX_INLINE_BLOCK: case BOX_FLOAT_LEFT: case BOX_FLOAT_RIGHT: @@ -246,6 +247,7 @@ bool box_normalise_table(struct box *table, struct content * c) } break; case BOX_INLINE: + case BOX_INLINE_END: case BOX_INLINE_BLOCK: case BOX_FLOAT_LEFT: case BOX_FLOAT_RIGHT: @@ -409,6 +411,7 @@ bool box_normalise_table_row_group(struct box *row_group, return false; break; case BOX_INLINE: + case BOX_INLINE_END: case BOX_INLINE_BLOCK: case BOX_FLOAT_LEFT: case BOX_FLOAT_RIGHT: @@ -506,6 +509,7 @@ bool box_normalise_table_row(struct box *row, return false; break; case BOX_INLINE: + case BOX_INLINE_END: case BOX_INLINE_BLOCK: case BOX_FLOAT_LEFT: case BOX_FLOAT_RIGHT: @@ -643,10 +647,7 @@ bool box_normalise_inline_container(struct box *cont, struct content * c) next_child = child->next; switch (child->type) { case BOX_INLINE: - /* correct end_inline_children to the box after the - * last inline child (see box_construct_element()) */ - child->end_inline_children = - child->end_inline_children->next; + case BOX_INLINE_END: case BOX_BR: case BOX_TEXT: /* ok */ -- cgit v1.2.3