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

Fix text-align left/right in RTL layout

Browse source
This commit is contained in:
Matt Brubeck 2015-04-28 21:33:45 -07:00
parent 81e8f18662
commit 50f982bb0c
4 changed files with 69 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/layout/inline.rs
View file

@ -895,10 +895,17 @@ impl InlineFlow {
let slack_inline_size = max(Au(0), line.green_zone.inline - line.bounds.size.inline); let slack_inline_size = max(Au(0), line.green_zone.inline - line.bounds.size.inline);
// Compute the value we're going to use for `text-justify`. // Compute the value we're going to use for `text-justify`.
let text_justify = if fragments.fragments.is_empty() { if fragments.fragments.is_empty() {
return return
} else { }
fragments.fragments[0].style().get_inheritedtext().text_justify let text_justify = fragments.fragments[0].style().get_inheritedtext().text_justify;
// Translate `left` and `right` to logical directions.
let is_ltr = fragments.fragments[0].style().writing_mode.is_bidi_ltr();
let line_align = match (line_align, is_ltr) {
(text_align::T::left, true) | (text_align::T::right, false) => text_align::T::start,
(text_align::T::left, false) | (text_align::T::right, true) => text_align::T::end,
_ => line_align
}; };
// Set the fragment inline positions based on that alignment, and justify the text if // Set the fragment inline positions based on that alignment, and justify the text if
@ -908,15 +915,16 @@ impl InlineFlow {
text_align::T::justify if !is_last_line && text_justify != text_justify::T::none => { text_align::T::justify if !is_last_line && text_justify != text_justify::T::none => {
InlineFlow::justify_inline_fragments(fragments, line, slack_inline_size) InlineFlow::justify_inline_fragments(fragments, line, slack_inline_size)
} }
text_align::T::left | text_align::T::justify | text_align::T::start => {} text_align::T::justify | text_align::T::start => {}
text_align::T::center => { text_align::T::center => {
inline_start_position_for_fragment = inline_start_position_for_fragment + inline_start_position_for_fragment = inline_start_position_for_fragment +
slack_inline_size.scale_by(0.5) slack_inline_size.scale_by(0.5)
} }
text_align::T::right | text_align::T::end => { text_align::T::end => {
inline_start_position_for_fragment = inline_start_position_for_fragment + inline_start_position_for_fragment = inline_start_position_for_fragment +
slack_inline_size slack_inline_size
} }
text_align::T::left | text_align::T::right => unreachable!()
} }
for fragment_index in line.range.begin()..line.range.end() { for fragment_index in line.range.begin()..line.range.end() {

1
tests/ref/basic.list
View file

@ -304,6 +304,7 @@ experimental == rtl_simple.html rtl_simple_ref.html
== table_percentage_width_a.html table_percentage_width_ref.html == table_percentage_width_a.html table_percentage_width_ref.html
== text_align_complex_a.html text_align_complex_ref.html == text_align_complex_a.html text_align_complex_ref.html
== text_align_justify_a.html text_align_justify_ref.html == text_align_justify_a.html text_align_justify_ref.html
experimental == text_align_rtl.html text_align_rtl_ref.html
experimental == text_align_start_end.html text_align_start_end_ref.html experimental == text_align_start_end.html text_align_start_end_ref.html
== text_decoration_cached.html text_decoration_cached_ref.html == text_decoration_cached.html text_decoration_cached_ref.html
# text_decoration_propagation_a.html text_decoration_propagation_b.html # text_decoration_propagation_a.html text_decoration_propagation_b.html

29
tests/ref/text_align_rtl.html Normal file
View file

@ -0,0 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" type="text/css" href="css/ahem.css">
<style>
body {
margin: 0;
font-size: 25px;
}
#a, #b {
text-align: left;
}
#c, #d {
text-align: right;
}
#b, #d {
direction: rtl;
}
</style>
</head>
<body>
<div id="a">X</div>
<div id="b">X</div>
<div id="c">X</div>
<div id="d">X</div>
</body>
</html>

26
tests/ref/text_align_rtl_ref.html Normal file
View file

@ -0,0 +1,26 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" type="text/css" href="css/ahem.css">
<style>
body {
margin: 0;
font-size: 25px;
}
#a, #b {
text-align: left;
}
#c, #d {
text-align: right;
}
</style>
</head>
<body>
<div id="a">X</div>
<div id="b">X</div>
<div id="c">X</div>
<div id="d">X</div>
</body>
</html>