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

Force root flow's box size to coincide with the viewport if child

Browse source 
flows have less combined height than the viewport height.

This makes Issue #218 go away in the case when the HTML element's
style specifies a background color.
This commit is contained in:
Brian J. Burg 2012-11-19 14:43:05 -08:00
parent 02e0734613
commit d76195757a
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/servo/layout/root.rs
View file

@ -48,14 +48,31 @@ impl FlowContext : RootLayout {
fn assign_widths_root(@self, ctx: &LayoutContext) { fn assign_widths_root(@self, ctx: &LayoutContext) {
assert self.starts_root_flow(); assert self.starts_root_flow();
self.d().position = copy ctx.screen_size; self.d().position.origin = Au::zero_point();
self.d().position.size.width = ctx.screen_size.size.width;
self.assign_widths_block(ctx) self.assign_widths_block(ctx)
} }
fn assign_height_root(@self, ctx: &LayoutContext) { fn assign_height_root(@self, ctx: &LayoutContext) {
assert self.starts_root_flow(); assert self.starts_root_flow();
self.assign_height_block(ctx); // this is essentially the same as assign_height_block(), except
// the root adjusts self height to at least cover the viewport.
let mut cur_y = Au(0);
for FlowTree.each_child(self) |child_ctx| {
child_ctx.d().position.origin.y = cur_y;
cur_y += child_ctx.d().position.size.height;
}
self.d().position.size.height = Au::max(ctx.screen_size.size.height, cur_y);
do self.with_block_box |box| {
box.d().position.origin.y = Au(0);
box.d().position.size.height = Au::max(ctx.screen_size.size.height, cur_y);
let (_used_top, _used_bot) = box.get_used_height();
}
} }
fn build_display_list_root(@self, builder: &DisplayListBuilder, dirty: &Rect<Au>, fn build_display_list_root(@self, builder: &DisplayListBuilder, dirty: &Rect<Au>,