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

Implement text-align of left, center, right.

Browse source
This commit is contained in:
Brian J. Burg 2012-11-16 16:27:02 -08:00
parent dba9905bbc
commit 31313d16b1
1 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/servo/layout/inline.rs
View file

@ -413,16 +413,46 @@ impl LineboxScanner {
// set box horizontal offsets // set box horizontal offsets
let line_range = self.pending_line.range.as_immutable(); let line_range = self.pending_line.range.as_immutable();
let mut offset_x = Au(0); let mut offset_x = Au(0);
// TODO: interpretation of CSS 'text-direction' and 'text-align' // TODO(Issue #199): interpretation of CSS 'direction' will change how boxes are positioned.
// will change from which side we start laying out the line.
debug!("LineboxScanner: Setting horizontal offsets for boxes in line %u range: %?", debug!("LineboxScanner: Setting horizontal offsets for boxes in line %u range: %?",
self.line_spans.len(), line_range); self.line_spans.len(), line_range);
for line_range.eachi |i| {
let box_data = &self.new_boxes[i].d();
box_data.position.origin.x = offset_x;
offset_x += box_data.position.size.width;
}
// TODO: use actual text align from box.style
enum CSSTextAlign {
AlignLeft,
AlignCenter,
AlignRight,
AlignJustify,
};
let linebox_align = AlignRight;
let slack_width = self.flow.d().position.size.width - self.pending_line.width;
match linebox_align {
// So sorry, but justified text is more complicated than shuffling linebox coordinates.
// TODO(Issue #213): implement `text-align: justify`
AlignLeft | AlignJustify => {
for line_range.eachi |i| {
let box_data = &self.new_boxes[i].d();
box_data.position.origin.x = offset_x;
offset_x += box_data.position.size.width;
}
},
AlignCenter => {
offset_x = slack_width.scale_by(0.5f);
for line_range.eachi |i| {
let box_data = &self.new_boxes[i].d();
box_data.position.origin.x = offset_x;
offset_x += box_data.position.size.width;
}
},
AlignRight => {
offset_x = slack_width;
for line_range.eachi |i| {
let box_data = &self.new_boxes[i].d();
box_data.position.origin.x = offset_x;
offset_x += box_data.position.size.width;
}
},
}
// clear line and add line mapping // clear line and add line mapping
debug!("LineboxScanner: Saving information for flushed line %u.", self.line_spans.len()); debug!("LineboxScanner: Saving information for flushed line %u.", self.line_spans.len());
self.line_spans.push(move line_range); self.line_spans.push(move line_range);