mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-11 13:29:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Initial stab at min/max-height support.

Browse Source 
svn path=/trunk/netsurf/; revision=3909
This commit is contained in:
Michael Drake 2008-03-09 19:39:17 +00:00
parent 7e08dfff8c
commit 052f8b47ff
1 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
render/layout.c
View File

@ -1,6 +1,7 @@
/*
* Copyright 2005 Richard Wilson <info@tinct.net>
* Copyright 2006 James Bursa <bursa@users.sourceforge.net>
* Copyright 2008 Michael Drake <tlsa@netsurf-browser.org>
* Copyright 2003 Phil Mellor <monkeyson@users.sourceforge.net>
*
* This file is part of NetSurf, http://www.netsurf-browser.org/
@ -60,6 +61,7 @@
static void layout_minmax_block(struct box *block);
static bool layout_block_object(struct box *block);
static void layout_block_find_dimensions(int available_width, struct box *box);
static void layout_apply_minmax_height(struct box *box);
static void layout_block_add_scrollbar(struct box *box, int which);
static int layout_solve_width(int available_width, int width,
int margin[4], int padding[4], int border[4]);
@ -379,8 +381,10 @@ bool layout_block_context(struct box *block, struct content *content)
break;
if (box->height == AUTO) {
box->height = y - box->padding[TOP];
layout_apply_minmax_height(box);
if (box->type == BOX_BLOCK)
layout_block_add_scrollbar(box, BOTTOM);
layout_block_add_scrollbar(box,
BOTTOM);
} else
cy += box->height -
(y - box->padding[TOP]);
@ -414,6 +418,7 @@ bool layout_block_context(struct box *block, struct content *content)
if (block->height == AUTO) {
block->height = cy - block->padding[TOP];
layout_apply_minmax_height(block);
if (block->type == BOX_BLOCK)
layout_block_add_scrollbar(block, BOTTOM);
}
@ -585,6 +590,46 @@ void layout_block_find_dimensions(int available_width, struct box *box)
margin[BOTTOM] = 0;
}
/**
* Manimpulate box height according to CSS min-height and max-height properties
*
* \param box block to modify with any min-height or max-height
*/
void layout_apply_minmax_height(struct box *box) {
int h;
if (box->style) {
/* max-height */
switch (box->style->max_height.max_height) {
case CSS_MAX_HEIGHT_LENGTH:
h = css_len2px(&box->style->max_height.value.
length, box->style);
if (h < box->height)
box->height = h;
break;
case CSS_MAX_HEIGHT_PERCENT:
/* percentage heights not yet implemented */
default:
break;
}
/* min-height */
switch (box->style->min_height.min_height) {
case CSS_MIN_HEIGHT_LENGTH:
h = css_len2px(&box->style->min_height.value.
length, box->style);
if (h > box->height)
box->height = h;
break;
case CSS_MIN_HEIGHT_PERCENT:
/* percentage heights not yet implemented */
default:
break;
}
}
}
/**
* Manipulate a block's [RB]padding/height/width to accommodate scrollbars
*/