From 50f982bb0cc6eced30161b81f803587a0c188fd3 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Tue, 28 Apr 2015 21:33:45 -0700 Subject: [PATCH] Fix text-align left/right in RTL layout --- components/layout/inline.rs | 18 +++++++++++++----- tests/ref/basic.list | 1 + tests/ref/text_align_rtl.html | 29 +++++++++++++++++++++++++++++ tests/ref/text_align_rtl_ref.html | 26 ++++++++++++++++++++++++++ 4 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 tests/ref/text_align_rtl.html create mode 100644 tests/ref/text_align_rtl_ref.html diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 39681a6836c..d2e48630ee8 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -895,10 +895,17 @@ impl InlineFlow { 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`. - let text_justify = if fragments.fragments.is_empty() { + if fragments.fragments.is_empty() { 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 @@ -908,15 +915,16 @@ impl InlineFlow { text_align::T::justify if !is_last_line && text_justify != text_justify::T::none => { 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 => { inline_start_position_for_fragment = inline_start_position_for_fragment + 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 + slack_inline_size } + text_align::T::left | text_align::T::right => unreachable!() } for fragment_index in line.range.begin()..line.range.end() { diff --git a/tests/ref/basic.list b/tests/ref/basic.list index e24b958a798..aa20b7fb70e 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -304,6 +304,7 @@ experimental == rtl_simple.html rtl_simple_ref.html == table_percentage_width_a.html table_percentage_width_ref.html == text_align_complex_a.html text_align_complex_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 == text_decoration_cached.html text_decoration_cached_ref.html # text_decoration_propagation_a.html text_decoration_propagation_b.html diff --git a/tests/ref/text_align_rtl.html b/tests/ref/text_align_rtl.html new file mode 100644 index 00000000000..050b900fbce --- /dev/null +++ b/tests/ref/text_align_rtl.html @@ -0,0 +1,29 @@ + + + + + + + + +
X
+
X
+
X
+
X
+ + + diff --git a/tests/ref/text_align_rtl_ref.html b/tests/ref/text_align_rtl_ref.html new file mode 100644 index 00000000000..9aa2852c45a --- /dev/null +++ b/tests/ref/text_align_rtl_ref.html @@ -0,0 +1,26 @@ + + + + + + + + +
X
+
X
+
X
+
X
+ + +