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

auto merge of #612 : metajack/servo/float-children, r=jdm

Browse source 
They were being positioned outside their parent's box in some cases.
This commit is contained in:
bors-servo 2013-07-22 09:51:27 -07:00
commit 4f227e0a98
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/main/layout/float.rs
View file

@ -253,7 +253,7 @@ impl FloatFlowData {
let flow = FloatFlow(self); let flow = FloatFlow(self);
for flow.each_child |child| { for flow.each_child |child| {
do child.with_mut_base |base| { do child.with_mut_base |base| {
base.abs_position = offset; base.abs_position = offset + base.position.origin;
} }
} }

2
src/components/main/layout/flow.rs
View file

@ -414,7 +414,7 @@ impl<'self> FlowContext {
} }
s.push_str(self.debug_str()); s.push_str(self.debug_str());
debug!("%s", s); println(s);
// FIXME: this should have a pure/const version? // FIXME: this should have a pure/const version?
for self.each_child |child| { for self.each_child |child| {

6
src/components/main/layout/layout_task.rs
View file

@ -210,12 +210,12 @@ impl LayoutTask {
Err(*) => fail!(~"Root flow should always exist") Err(*) => fail!(~"Root flow should always exist")
}; };
debug!("layout: constructed Flow tree");
debug!("%?", layout_root.dump());
layout_root layout_root
}; };
debug!("layout: constructed Flow tree");
debug!("", layout_root.dump());
// Perform the primary layout passes over the flow tree to compute the locations of all // Perform the primary layout passes over the flow tree to compute the locations of all
// the boxes. // the boxes.
do profile(time::LayoutMainCategory, self.profiler_chan.clone()) { do profile(time::LayoutMainCategory, self.profiler_chan.clone()) {