mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-27 03:44:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2005-04-28 01:50:55 by rjw]

Browse Source 
Respect minimum height for tr.

svn path=/import/netsurf/; revision=1693
This commit is contained in:
Richard Wilson 2005-04-28 01:50:55 +00:00
parent 991b660eea
commit 7525f1dc31
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
render/layout.c
View File

@ -1483,7 +1483,11 @@ bool layout_table(struct box *table, int available_width,
row_group = row_group->next) { row_group = row_group->next) {
int row_group_height = 0; int row_group_height = 0;
for (row = row_group->children; row; row = row->next) { for (row = row_group->children; row; row = row->next) {
int row_height = 0; /* some sites use height="1" or similar
* to attempt to make cells as small as
* possible, so treat it as a minimum */
int row_height = (int) css_len2px(&row->style->
height.length, row->style);
for (c = row->children; c; c = c->next) { for (c = row->children; c; c = c->next) {
assert(c->style); assert(c->style);
c->width = xs[c->start_column + c->columns] - c->width = xs[c->start_column + c->columns] -
@ -1988,7 +1992,7 @@ bool calculate_table_widths(struct box *table)
row_group = row_group->next) { row_group = row_group->next) {
for (row = row_group->children; row; row = row->next) { for (row = row_group->children; row; row = row->next) {
for (cell = row->children; cell; cell = cell->next) { for (cell = row->children; cell; cell = cell->next) {
if (!first) { if (!first) {
cell->style->border[TOP].style = cell->style->border[TOP].style =
CSS_BORDER_STYLE_NONE; CSS_BORDER_STYLE_NONE;
cell->style->border[TOP].width.value.value = cell->style->border[TOP].width.value.value =
@ -2223,7 +2227,7 @@ void table_collapse_borders_cell(struct box *cell, struct box *right,
border = css_eyecatching_border(&cell->style->border[RIGHT], cell->style, border = css_eyecatching_border(&cell->style->border[RIGHT], cell->style,
&right->style->border[LEFT], right->style); &right->style->border[LEFT], right->style);
cell->style->border[RIGHT] = *border; cell->style->border[RIGHT] = *border;
} }
if ((bottom) && (bottom != cell)) { if ((bottom) && (bottom != cell)) {
border = css_eyecatching_border(&cell->style->border[BOTTOM], cell->style, border = css_eyecatching_border(&cell->style->border[BOTTOM], cell->style,
@ -2259,10 +2263,10 @@ struct box *table_find_cell(struct box *table, unsigned int x,
struct box *row_group, *row, *cell; struct box *row_group, *row, *cell;
struct box *match = NULL; struct box *match = NULL;
unsigned int cur_row = 0; unsigned int cur_row = 0;
if ((x > table->columns) || (y > table->rows)) if ((x > table->columns) || (y > table->rows))
return NULL; return NULL;
/* this code uses brute-force and should be re-implemented using a faster /* this code uses brute-force and should be re-implemented using a faster
* algorithm */ * algorithm */
for (row_group = table->children; row_group; for (row_group = table->children; row_group;