summaryrefslogtreecommitdiff
path: root/render/layout.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2009-04-28 20:13:10 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2009-04-28 20:13:10 +0000
commita99a5bdd707f27c9fb9a92a18f94830d710a7bee (patch)
tree1d12e722ca260012edec5df748c819ac4c08db44 /render/layout.c
parent044a9534008fd77a2cf8755943f3fe42fa177d54 (diff)
downloadnetsurf-a99a5bdd707f27c9fb9a92a18f94830d710a7bee.tar.gz
netsurf-a99a5bdd707f27c9fb9a92a18f94830d710a7bee.tar.bz2
Move handling of TR height attribute from box construction to layout and add support for height property on TR.
svn path=/trunk/netsurf/; revision=7358
Diffstat (limited to 'render/layout.c')
-rw-r--r--render/layout.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/render/layout.c b/render/layout.c
index 05b668aad..fd53995b8 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -2772,6 +2772,11 @@ bool layout_table(struct box *table, int available_width,
int row_group_height = 0;
for (row = row_group->children; row; row = row->next) {
int row_height = 0;
+ if (row->style->height.height == CSS_HEIGHT_LENGTH) {
+ row_height = (int) css_len2px(&row->style->
+ height.value.length,
+ row->style);
+ }
for (c = row->children; c; c = c->next) {
assert(c->style);
c->width = xs[c->start_column + c->columns] -
@@ -2807,6 +2812,10 @@ bool layout_table(struct box *table, int available_width,
if (c->height < h)
c->height = h;
}
+ /* specified row height is treated as a minimum
+ */
+ if (c->height < row_height)
+ c->height = row_height;
c->x = xs[c->start_column] + c->border[LEFT];
c->y = c->border[TOP];
for (i = 0; i != c->columns; i++) {