mirror of
https://github.com/servo/servo.git
synced 2025-07-22 14:53:49 +01:00
style: Adjust text-align properly for -moz- values in tables.
Fixes bug 1363576. Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
This commit is contained in:
parent
0040160b38
commit
3ec2b4f486
2 changed files with 24 additions and 1 deletions
|
@ -3385,7 +3385,6 @@ fn static_assert() {
|
|||
<% text_align_keyword = Keyword("text-align",
|
||||
"start end left right center justify -moz-center -moz-left -moz-right char",
|
||||
gecko_strip_moz_prefix=False) %>
|
||||
<% text_align_reachable_keyword = Keyword("text-align", "start end left right center justify char") %>
|
||||
${impl_keyword('text_align', 'mTextAlign', text_align_keyword, need_clone=False)}
|
||||
${impl_keyword_clone('text_align', 'mTextAlign', text_align_keyword)}
|
||||
|
||||
|
|
|
@ -259,6 +259,29 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
|
|||
}
|
||||
}
|
||||
|
||||
/// -moz-center, -moz-left and -moz-right are used for HTML's alignment.
|
||||
///
|
||||
/// This is covering the <div align="right"><table>...</table></div> case.
|
||||
///
|
||||
/// In this case, we don't want to inherit the text alignment into the
|
||||
/// table.
|
||||
#[cfg(feature = "gecko")]
|
||||
fn adjust_for_table_text_align(&mut self) {
|
||||
use properties::longhands::text_align::computed_value::T as text_align;
|
||||
if self.style.get_box().clone_display() != display::table {
|
||||
return;
|
||||
}
|
||||
|
||||
match self.style.get_inheritedtext().clone_text_align() {
|
||||
text_align::_moz_left |
|
||||
text_align::_moz_center |
|
||||
text_align::_moz_right => {}
|
||||
_ => return,
|
||||
}
|
||||
|
||||
self.style.mutate_inheritedtext().set_text_align(text_align::start);
|
||||
}
|
||||
|
||||
/// Adjusts the style to account for various fixups that don't fit naturally
|
||||
/// into the cascade.
|
||||
///
|
||||
|
@ -274,6 +297,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
|
|||
self.adjust_for_overflow();
|
||||
#[cfg(feature = "gecko")]
|
||||
{
|
||||
self.adjust_for_table_text_align();
|
||||
self.adjust_for_contain();
|
||||
}
|
||||
#[cfg(feature = "servo")]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue