diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-11-26 18:39:38 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-11-26 18:39:38 -0700 |
| commit | 431644bfc8208b613bf69a89826376ffb143cb58 (patch) | |
| tree | b8a00a2ae622859a0fc360ada99aa563b04c0458 /components/layout/table.rs | |
| parent | 184a3346ab2fb2a4dfd267681af02711cfb6bc44 (diff) | |
| parent | 59cdce30010c108303dfcf4a57596f31e0b4b4ac (diff) | |
| download | servo-431644bfc8208b613bf69a89826376ffb143cb58.tar.gz servo-431644bfc8208b613bf69a89826376ffb143cb58.zip | |
auto merge of #4114 : glennw/servo/table-layout-fix, r=pcwalton
Diffstat (limited to 'components/layout/table.rs')
| -rw-r--r-- | components/layout/table.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/components/layout/table.rs b/components/layout/table.rs index 72f11d66fbf..20bc19c91fc 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -265,12 +265,9 @@ impl Flow for TableFlow { // if there are any, or among all the columns if all are specified. if total_column_inline_size < content_inline_size && num_unspecified_inline_sizes == 0 { - let extra_column_inline_size = content_inline_size; - (content_inline_size - total_column_inline_size) / - (self.column_inline_sizes.len() as i32); + let ratio = content_inline_size.to_subpx() / total_column_inline_size.to_subpx(); for column_inline_size in self.column_inline_sizes.iter_mut() { - column_inline_size.minimum_length = column_inline_size.minimum_length + - extra_column_inline_size; + column_inline_size.minimum_length = column_inline_size.minimum_length.scale_by(ratio); column_inline_size.percentage = 0.0; } } else if num_unspecified_inline_sizes != 0 { |