diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2008-09-05 13:04:30 +0000 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2008-09-05 13:04:30 +0000 |
| commit | 668dd06dc3a6eb88626d07f67a3e53ebcf434855 (patch) | |
| tree | e290e7a5a15378f5164ec8938d2af1420a800764 | |
| parent | 9ea2e2c133186ac78b14cf5e51a0c13eb47d3b7a (diff) | |
| download | netsurf-668dd06dc3a6eb88626d07f67a3e53ebcf434855.tar.gz netsurf-668dd06dc3a6eb88626d07f67a3e53ebcf434855.tar.bz2 | |
Add comments and change height attribute handling on TR to only alter the height if attribute height is greater than current height.
svn path=/trunk/netsurf/; revision=5259
| -rw-r--r-- | css/css.c | 19 | ||||
| -rw-r--r-- | render/box_construct.c | 10 |
2 files changed, 19 insertions, 10 deletions
@@ -131,7 +131,7 @@ static bool css_match_detail(const struct css_selector *detail, xmlNode *element); static bool css_match_first_child(const struct css_selector *detail, xmlNode *element); -static void css_dump_length(FILE *stream, +static void css_dump_length(FILE *stream, const struct css_length * const length); static void css_dump_selector(const struct css_selector *r); #ifdef DEBUG_WORKING_STYLESHEET @@ -2065,7 +2065,7 @@ void css_dump_style(FILE *stream, const struct css_style * const style) fprintf(stream, "inherit"); break; case CSS_MIN_HEIGHT_LENGTH: - css_dump_length(stream, + css_dump_length(stream, &style->min_height.value.length); break; case CSS_MIN_HEIGHT_PERCENT: @@ -3151,22 +3151,29 @@ float css_len2px(const struct css_length *length, if ((font.value = css_len2pt(&style-> font_size.value.length, style)) < option_font_min_size / 10) { + /* min font size is greater than given length so + * use min font size for conversion to px */ font.value = option_font_min_size / 10; return length->value * css_len2px(&font, - style); + style); } else + /* use given length for conversion to px */ return length->value * css_len2px(&style-> - font_size.value.length, 0); + font_size.value.length, 0); case CSS_UNIT_EX: if ((font.value = css_len2pt(&style-> font_size.value.length, style)) < option_font_min_size / 10) { + /* min font size is greater than given length so + * use min font size for conversion to px */ font.value = option_font_min_size / 10; return length->value * css_len2px(&font, - style) * 0.6; + style) * 0.6; } else + /* use given length for conversion to px */ return length->value * css_len2px(&style-> - font_size.value.length, 0) * 0.6; + font_size.value.length, 0) * + 0.6; case CSS_UNIT_PX: return length->value; /* We assume the screen and any other output has the same dpi */ case CSS_UNIT_IN: return length->value * css_screen_dpi; diff --git a/render/box_construct.c b/render/box_construct.c index f65270e9c..8df7ba016 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -578,12 +578,14 @@ bool box_construct_element(xmlNode *n, struct content *content, float current; for (child = box->children; child; child = child->next) { - if (child->type == BOX_TABLE_CELL) { - current = css_len2px( + current = css_len2px( &child->style->height. length, child->style); - value = (value > current) ? - value : current; + if (child->type == BOX_TABLE_CELL && + value > current) { + /* Row height exceeds cell + * height, increase cell height + * to row height */ child->style->height.height = CSS_HEIGHT_LENGTH; child->style->height.length. |