summaryrefslogtreecommitdiff
path: root/render/box_normalise.c
diff options
context:
space:
mode:
authorJames Bursa <james@netsurf-browser.org>2005-06-05 20:54:37 +0000
committerJames Bursa <james@netsurf-browser.org>2005-06-05 20:54:37 +0000
commit57b68bd9332f4c1636073ab8dd10a3ce50a173cf (patch)
tree8323cb6b6ed9a63b75751c6fa892c6f927c2c833 /render/box_normalise.c
parent99a483dd7b744ede170eeffde5ec30fd8ed1a0e5 (diff)
downloadnetsurf-57b68bd9332f4c1636073ab8dd10a3ce50a173cf.tar.gz
netsurf-57b68bd9332f4c1636073ab8dd10a3ce50a173cf.tar.bz2
[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
Diffstat (limited to 'render/box_normalise.c')
-rw-r--r--render/box_normalise.c9
1 files changed, 5 insertions, 4 deletions
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 */