Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Switch column-count to use predefined integer type

Browse source
This commit is contained in:
Xidorn Quan 2017-03-17 17:52:45 +11:00
parent 9233882d49
commit ab0e5c9d99
5 changed files with 22 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/layout/multicol.rs
View file

@ -106,11 +106,14 @@ impl Flow for MulticolFlow {
if let Either::First(column_width) = column_style.column_width {
column_count =
max(1, (content_inline_size + column_gap).0 / (column_width + column_gap).0);
if let Some(specified_column_count) = column_style.column_count.0 {
if let Either::First(specified_column_count) = column_style.column_count {
column_count = min(column_count, specified_column_count as i32);
}
} else {
column_count = column_style.column_count.0.unwrap() as i32;
column_count = match column_style.column_count {
Either::First(n) => n,
_ => unreachable!(),
}
}
column_width =
max(Au(0), (content_inline_size + column_gap) / column_count - column_gap);