diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2009-01-26 16:32:19 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2009-01-26 16:32:19 +0000 |
| commit | aa787e9730cbf5f8752c6ef233db38e41ce65aae (patch) | |
| tree | 8948e378bf6b7eb72b3f9f618e2c08cb609d3bb1 /render | |
| parent | 0a175d4020373b5e9bd040a6e03db177be2c0f0b (diff) | |
| download | netsurf-aa787e9730cbf5f8752c6ef233db38e41ce65aae.tar.gz netsurf-aa787e9730cbf5f8752c6ef233db38e41ce65aae.tar.bz2 | |
Fix specified table widths to include border. Tidy block formatting context and table position setup.
svn path=/trunk/netsurf/; revision=6281
Diffstat (limited to 'render')
| -rw-r--r-- | render/layout.c | 34 |
1 files changed, 26 insertions, 8 deletions
diff --git a/render/layout.c b/render/layout.c index 6a700e019..5f0b4a4ff 100644 --- a/render/layout.c +++ b/render/layout.c @@ -339,16 +339,19 @@ bool layout_block_context(struct box *block, struct content *content) int x0, x1, top; struct box *left, *right; top = cy > y ? cy : y; - x0 = cx - box->parent->padding[LEFT]; + x0 = cx; x1 = cx + box->parent->width - + box->parent->padding[LEFT] - box->parent->padding[RIGHT]; find_sides(block->float_children, top, top, &x0, &x1, &left, &right); /* calculate min required left & right margins * needed to avoid floats */ - lm = x0 - cx - box->parent->padding[LEFT]; - rm = cx + box->parent->width - x1 - - box->parent->padding[RIGHT]; + lm = x0 - cx; + rm = cx + box->parent->width - + box->parent->padding[LEFT] - + box->parent->padding[RIGHT] - + x1; } layout_block_find_dimensions(box->parent->width, lm, rm, box); @@ -362,14 +365,18 @@ bool layout_block_context(struct box *block, struct content *content) struct box *left, *right; top = cy > y ? cy : y; x0 = cx; - x1 = cx + box->parent->width; + x1 = cx + box->parent->width - + box->parent->padding[LEFT] - + box->parent->padding[RIGHT]; find_sides(block->float_children, top, top, &x0, &x1, &left, &right); /* calculate min required left & right margins * needed to avoid floats */ - lm = x0 - cx - box->parent->padding[LEFT]; - rm = cx + box->parent->width - x1 - - box->parent->padding[RIGHT]; + lm = x0 - cx; + rm = cx + box->parent->width - + box->parent->padding[LEFT] - + box->parent->padding[RIGHT] - + x1; } if (!layout_table(box, box->parent->width - lm - rm, content)) @@ -421,6 +428,7 @@ bool layout_block_context(struct box *block, struct content *content) layout_block_add_scrollbar(box, BOTTOM); } + cx -= box->x; cy += box->height + box->padding[BOTTOM] + box->border[BOTTOM]; max_pos_margin = max_neg_margin = 0; @@ -2531,11 +2539,21 @@ bool layout_table(struct box *table, int available_width, switch (style->width.width) { case CSS_WIDTH_LENGTH: table_width = css_len2px(&style->width.value.length, style); + + /* specified width includes border */ + table_width -= table->border[LEFT] + table->border[RIGHT]; + table_width = table_width < 0 ? 0 : table_width; + auto_width = table_width; break; case CSS_WIDTH_PERCENT: table_width = ceil(available_width * style->width.value.percent / 100); + + /* specified width includes border */ + table_width -= table->border[LEFT] + table->border[RIGHT]; + table_width = table_width < 0 ? 0 : table_width; + auto_width = table_width; break; case CSS_WIDTH_AUTO: |