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

Positioning fixes for RTL floats

Browse source
This commit is contained in:
Matt Brubeck 2015-05-18 16:50:51 -07:00
parent ec5c333347
commit 0048b4f2ab
6 changed files with 52 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/layout/block.rs
View file

@ -1049,7 +1049,8 @@ impl BlockFlow {
let float_offset = self.base.floats.last_float_pos().unwrap()
.convert(self.base.floats.writing_mode,
self.base.writing_mode,
container_size);
container_size)
.start;
let margin_offset = LogicalPoint::new(self.base.writing_mode,
Au(0),
self.fragment.margin.block_start);

6
components/layout/floats.rs
View file

@ -4,7 +4,7 @@
use util::geometry::Au;
use util::logical_geometry::WritingMode;
use util::logical_geometry::{LogicalPoint, LogicalRect, LogicalSize};
use util::logical_geometry::{LogicalRect, LogicalSize};
use util::persistent_list::PersistentList;
use std::cmp::{max, min};
use std::i32;
@ -146,10 +146,10 @@ impl Floats {
}
/// Returns the position of the last float in flow coordinates.
pub fn last_float_pos(&self) -> Option<LogicalPoint<Au>> {
pub fn last_float_pos(&self) -> Option<LogicalRect<Au>> {
match self.list.floats.front() {
None => None,
Some(float) => Some(float.bounds.start + self.offset),
Some(float) => Some(float.bounds.translate_by_size(self.offset)),
}
}