mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-23 06:51:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use height type enum.

Browse Source 
svn path=/trunk/netsurf/; revision=12413
This commit is contained in:
Michael Drake 2011-05-16 10:29:34 +00:00
parent d25e5568bb
commit 5e823ede7c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
render/layout.c
View File

@ -706,7 +706,7 @@ void layout_minmax_block(struct box *block,
enum css_width_e wtype = CSS_WIDTH_AUTO;
css_fixed width = 0;
css_unit wunit = CSS_UNIT_PX;
enum css_width_e htype = CSS_HEIGHT_AUTO;
enum css_height_e htype = CSS_HEIGHT_AUTO;
css_fixed height = 0;
css_unit hunit = CSS_UNIT_PX;
bool child_has_height = false;
@ -840,7 +840,8 @@ void layout_minmax_block(struct box *block,
min = max = FIXTOINT(nscss_len2px(width, wunit, block->style));
}
if (height > 0 && hunit != CSS_UNIT_PCT) {
if (htype == CSS_HEIGHT_SET && hunit != CSS_UNIT_PCT &&
height > INTTOFIX(0)) {
block->flags |= MAKE_HEIGHT;
block->flags |= HAS_HEIGHT;
}