mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[project @ 2003-07-20 13:58:12 by bursa] 

Line-height fixes.

svn path=/import/netsurf/; revision=240
This commit is contained in:
James Bursa 2003-07-20 13:58:12 +00:00
parent c17ede41d1
commit e13bb8daa8
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
css/ruleset.c
View File

@ -407,9 +407,9 @@ void parse_line_height(struct css_style * const s, const struct node * const v)
} else if (v->type == NODE_DIMENSION &&
parse_length(&s->line_height.value.length, v) == 0) {
s->line_height.size = CSS_LINE_HEIGHT_LENGTH;
} else if (v->type == NODE_NUMBER && atof(v->data) == 0.0) {
} else if (v->type == NODE_NUMBER) {
s->line_height.size = CSS_LINE_HEIGHT_ABSOLUTE;
s->line_height.value.absolute = 0.0;
s->line_height.value.absolute = atof(v->data);
}
}

7
render/layout.c
View File

@ -304,12 +304,15 @@ signed long line_height(struct css_style * style)
{
assert(style != 0);
assert(style->line_height.size == CSS_LINE_HEIGHT_LENGTH ||
style->line_height.size == CSS_LINE_HEIGHT_ABSOLUTE);
style->line_height.size == CSS_LINE_HEIGHT_ABSOLUTE ||
style->line_height.size == CSS_LINE_HEIGHT_PERCENT);
if (style->line_height.size == CSS_LINE_HEIGHT_LENGTH)
return len(&style->line_height.value.length, style);
else
else if (style->line_height.size == CSS_LINE_HEIGHT_ABSOLUTE)
return style->line_height.value.absolute * len(&style->font_size.value.length, 0);
else
return style->line_height.value.percent * len(&style->font_size.value.length, 0) / 100.0;
}