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

auto merge of #903 : ILyoan/servo/margin_collapse_fix, r=metajack

Browse source
This commit is contained in:
bors-servo 2013-09-17 07:27:50 -07:00
commit 585b047dda
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/components/main/layout/block.rs
View file

@ -7,7 +7,7 @@
use layout::box::{RenderBox}; use layout::box::{RenderBox};
use layout::context::LayoutContext; use layout::context::LayoutContext;
use layout::display_list_builder::{DisplayListBuilder, ExtraDisplayListData}; use layout::display_list_builder::{DisplayListBuilder, ExtraDisplayListData};
use layout::flow::{BlockFlow, FlowContext, FlowData, InlineBlockFlow, FloatFlow}; use layout::flow::{BlockFlow, FlowContext, FlowData, InlineBlockFlow, FloatFlow, InlineFlow};
use layout::inline::InlineLayout; use layout::inline::InlineLayout;
use layout::model::{MaybeAuto, Specified, Auto}; use layout::model::{MaybeAuto, Specified, Auto};
use layout::float_context::{FloatContext, Invalid}; use layout::float_context::{FloatContext, Invalid};
@ -331,6 +331,7 @@ impl BlockFlowData {
margin_bottom = model.margin.bottom; margin_bottom = model.margin.bottom;
} }
} }
for kid in self.common.child_iter() { for kid in self.common.child_iter() {
match *kid { match *kid {
BlockFlow(ref info) => { BlockFlow(ref info) => {
@ -357,10 +358,18 @@ impl BlockFlowData {
} }
first_inflow = false; first_inflow = false;
} }
InlineFlow(ref info) => {
collapsing = Au(0);
// Non-empty inline flows prevent collapsing between the previous margion and the next.
if info.common.position.size.height > Au(0) {
collapsible = Au(0);
}
}
// Margins between a floated box and any other box do not collapse. // Margins between a floated box and any other box do not collapse.
_ => { _ => {
collapsing = Au(0); collapsing = Au(0);
} }
// TODO: Handling for AbsoluteFlow, InlineBlockFlow and TableFlow?
} }
do kid.with_mut_base |child_node| { do kid.with_mut_base |child_node| {