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

Auto merge of #13674 - Manishearth:column_count, r=emilio

Browse source 
Implement column-count in stylo

Unblocks column-fill easy property
r? @emilio

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13674)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-10 09:37:29 -05:00 • committed by GitHub
commit aef6054dc6
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
components/style/properties/gecko.mako.rs
View file

@ -468,8 +468,6 @@ impl Debug for ${style_struct.gecko_struct_name} {
# transition # transition
"transition-duration", "transition-timing-function", "transition-duration", "transition-timing-function",
"transition-property", "transition-delay", "transition-property", "transition-delay",
"column-count", # column
] ]
# Types used with predefined_type()-defined properties that we can auto-generate. # Types used with predefined_type()-defined properties that we can auto-generate.
@ -1911,7 +1909,7 @@ clip-path
</%self:impl_trait> </%self:impl_trait>
<%self:impl_trait style_struct_name="Column" <%self:impl_trait style_struct_name="Column"
skip_longhands="column-width"> skip_longhands="column-width column-count">
pub fn set_column_width(&mut self, v: longhands::column_width::computed_value::T) { pub fn set_column_width(&mut self, v: longhands::column_width::computed_value::T) {
match v.0 { match v.0 {
@ -1921,6 +1919,17 @@ clip-path
} }
${impl_coord_copy('column_width', 'mColumnWidth')} ${impl_coord_copy('column_width', 'mColumnWidth')}
pub fn set_column_count(&mut self, v: longhands::column_count::computed_value::T) {
use gecko_bindings::structs::{NS_STYLE_COLUMN_COUNT_AUTO, nsStyleColumn_kMaxColumnCount};
self.gecko.mColumnCount = match v.0 {
Some(number) => cmp::min(number, nsStyleColumn_kMaxColumnCount),
None => NS_STYLE_COLUMN_COUNT_AUTO
};
}
${impl_simple_copy('column_count', 'mColumnCount')}
</%self:impl_trait> </%self:impl_trait>
<%self:impl_trait style_struct_name="Counters" <%self:impl_trait style_struct_name="Counters"