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 #6976 - pcwalton:vertical-marker-placement, r=mbrubeck

Browse source 
layout: Place list item markers correctly in the block direction.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6976)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-05 00:57:19 -06:00
commit 56a9eab2a0
4 changed files with 36 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/layout/list_item.rs
View file

@ -116,8 +116,9 @@ impl Flow for ListItemFlow {
let item_inline_metrics = InlineMetrics::from_font_metrics(&font_metrics, line_height);
let marker_inline_metrics = marker.inline_metrics(layout_context);
marker.border_box.start.b = item_inline_metrics.block_size_above_baseline -
marker_inline_metrics.block_size_above_baseline;
marker.border_box.size.block = marker_inline_metrics.block_size_above_baseline;
marker_inline_metrics.ascent;
marker.border_box.size.block = marker_inline_metrics.ascent +
marker_inline_metrics.depth_below_baseline;
}
}

1
tests/ref/basic.list
View file

@ -198,6 +198,7 @@ flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html
== many_brs_a.html many_brs_ref.html
== margin_a.html margin_b.html
== margins_inside_floats_a.html margins_inside_floats_ref.html
== marker_block_direction_placement_a.html marker_block_direction_placement_ref.html
== max_width_float_simple_a.html max_width_float_simple_b.html
== max_width_simple_a.html max_width_simple_b.html
== min_max_height_a.html min_max_height_b.html

12
tests/ref/marker_block_direction_placement_a.html Normal file
View file

@ -0,0 +1,12 @@
<!DOCTYPE html>
<style>
body, ol, p {
margin: 0;
font-size: 16px;
}
body {
line-height: 10;
}
</style>
<ol><li>Hello</ol>

20
tests/ref/marker_block_direction_placement_ref.html Normal file
View file

@ -0,0 +1,20 @@
<!DOCTYPE html>
<style>
body, ol, p {
margin: 0;
font-size: 16px;
}
body {
line-height: 10;
}
section {
position: absolute;
top: 0;
left: 0;
right: 0;
height: 64px;
background: white;
}
</style>
<ol><li>Hello</ol><section></section>