From 60a9d3af3be35eb3a5f414044a797a21dc77f907 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 24 Nov 2011 17:22:25 +0000 Subject: Only make space for vertical box scrollbar if box has height set. svn path=/trunk/netsurf/; revision=13179 --- render/layout.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/render/layout.c b/render/layout.c index fd9c7f7cf..8d4d50fd7 100644 --- a/render/layout.c +++ b/render/layout.c @@ -1258,12 +1258,18 @@ void layout_block_add_scrollbar(struct box *box, int which) (box->object && content_get_type(box->object) == CONTENT_HTML)) { /* make space for scrollbars, unless height/width are AUTO */ + enum css_height_e htype; + css_fixed height = 0; + css_unit hunit = CSS_UNIT_PX; + htype = css_computed_height(box->style, &height, &hunit); + if (which == BOTTOM && box->height != AUTO && (overflow == CSS_OVERFLOW_SCROLL || box_hscrollbar_present(box))) { box->padding[BOTTOM] += SCROLLBAR_WIDTH; } if (which == RIGHT && box->width != AUTO && + htype == CSS_HEIGHT_SET && (overflow == CSS_OVERFLOW_SCROLL || box_vscrollbar_present(box))) { box->width -= SCROLLBAR_WIDTH; -- cgit v1.2.3