diff options
| -rw-r--r-- | !NetSurf/Resources/CSS,f79 | 2 | ||||
| -rw-r--r-- | render/layout.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/!NetSurf/Resources/CSS,f79 b/!NetSurf/Resources/CSS,f79 index fb656cbef..5bc69b128 100644 --- a/!NetSurf/Resources/CSS,f79 +++ b/!NetSurf/Resources/CSS,f79 @@ -154,7 +154,7 @@ form > * { margin-left: inherit; margin-right: inherit; } input { background-color: #fff; color: #000; width: 10em; height: 1.5em; text-align: left; border-width: 1px; border-color: #000; border-style: solid; overflow: hidden; - padding: 0 2px; } + padding: 0 2px; margin: 1px;} input[type=button], input[type=reset], input[type=submit], button { background-color: #d9d9d9; color: #000; width: auto; border-width: medium; border-color: #d9d9d9; diff --git a/render/layout.c b/render/layout.c index 31a18cdee..39f7a8995 100644 --- a/render/layout.c +++ b/render/layout.c @@ -1081,7 +1081,6 @@ bool layout_line(struct box *first, int *width, int *y, if (b->width == UNKNOWN_WIDTH) if (!layout_float(b, *width, content)) return false; - /** \todo should margin be included? spec unclear */ h = b->border[TOP] + b->padding[TOP] + b->height + b->padding[BOTTOM] + b->border[BOTTOM]; if (height < h) @@ -1508,7 +1507,7 @@ bool layout_line(struct box *first, int *width, int *y, } if (d->type == BOX_INLINE_BLOCK) { d->x += x0; - d->y = *y + d->border[TOP]; + d->y = *y + d->border[TOP] + d->margin[TOP]; } if (d->type == BOX_INLINE_BLOCK && (d->style->position == CSS_POSITION_ABSOLUTE || @@ -1516,8 +1515,9 @@ bool layout_line(struct box *first, int *width, int *y, continue; if ((d->type == BOX_INLINE && (d->object || d->gadget)) || d->type == BOX_INLINE_BLOCK) { - h = d->border[TOP] + d->padding[TOP] + d->height + - d->padding[BOTTOM] + d->border[BOTTOM]; + h = d->margin[TOP] + d->border[TOP] + d->padding[TOP] + + d->height + d->padding[BOTTOM] + + d->border[BOTTOM] + d->margin[BOTTOM]; if (used_height < h) used_height = h; } |