Fixed (?) problem with arithmentic exceptions in row/column

spanned tables.
This commit is contained in:
Owen Taylor 1998-02-03 05:23:03 +00:00
parent fc86f630a6
commit febe6498f2

View File

@ -717,11 +717,8 @@ gtk_table_size_request_pass3 (GtkTable *table)
for (col = child->left_attach; col < child->right_attach; col++) for (col = child->left_attach; col < child->right_attach; col++)
{ {
extra = width / (child->right_attach - child->left_attach - col); extra = width / (child->right_attach - col);
if ((col + 1) < child->right_attach) table->cols[col].requisition += extra;
table->cols[col].requisition += extra;
else
table->cols[col].requisition += width;
width -= extra; width -= extra;
} }
} }
@ -752,11 +749,8 @@ gtk_table_size_request_pass3 (GtkTable *table)
for (row = child->top_attach; row < child->bottom_attach; row++) for (row = child->top_attach; row < child->bottom_attach; row++)
{ {
extra = height / (child->bottom_attach - child->top_attach - row); extra = height / (child->bottom_attach - row);
if ((row + 1) < child->bottom_attach) table->rows[row].requisition += extra;
table->rows[row].requisition += extra;
else
table->rows[row].requisition += height;
height -= extra; height -= extra;
} }
} }