summaryrefslogtreecommitdiff
path: root/render/layout.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2011-05-16 10:29:34 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2011-05-16 10:29:34 +0000
commit5e823ede7cdff33b23b473680b0bf515cd54618e (patch)
tree32dffdaad9ae16b30a9a68cdfbf62c970e95db0d /render/layout.c
parentd25e5568bb082e26c0c3755b9cd504660cee0e70 (diff)
downloadnetsurf-5e823ede7cdff33b23b473680b0bf515cd54618e.tar.gz
netsurf-5e823ede7cdff33b23b473680b0bf515cd54618e.tar.bz2
Use height type enum.
svn path=/trunk/netsurf/; revision=12413
Diffstat (limited to 'render/layout.c')
-rw-r--r--render/layout.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/render/layout.c b/render/layout.c
index 3271a955b..60ad8baa9 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -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;
}