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

Convert column-width to use Either

Browse source 
Fixes #14350
This commit is contained in:
J. Cliff Dyer 2016-11-28 07:21:11 -05:00 • committed by Ravi Shankar
parent f159b5cb10
commit 5821ff77db
8 changed files with 38 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/multicol.rs
View file

@ -24,6 +24,7 @@ use std::sync::Arc;
use style::context::{StyleContext, SharedStyleContext};
use style::logical_geometry::LogicalSize;
use style::properties::ServoComputedValues;
use style::values::Either;
use style::values::computed::{LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
pub struct MulticolFlow {
@ -102,7 +103,7 @@ impl Flow for MulticolFlow {
let column_gap = column_style.column_gap.0.unwrap_or_else(||
self.block_flow.fragment.style.get_font().font_size);
let mut column_count;
if let Some(column_width) = column_style.column_width.0 {
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 {