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

Always use the border-box for Box.position.size

Browse source 
Fixes #1674.
This commit is contained in:
Keegan McAllister 2014-02-14 12:43:43 -08:00
parent 0523032afe
commit f8f17cf475
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/main/layout/box_.rs
View file

@ -72,6 +72,7 @@ pub struct Box {
style: Arc<ComputedValues>, style: Arc<ComputedValues>,
/// The position of this box relative to its owning flow. /// The position of this box relative to its owning flow.
/// The size includes padding and border, but not margin.
position: RefCell<Rect<Au>>, position: RefCell<Rect<Au>>,
/// The border of the content box. /// The border of the content box.
@ -308,7 +309,7 @@ pub struct InlineParentInfo {
macro_rules! def_noncontent( ($side:ident, $get:ident, $inline_get:ident) => ( macro_rules! def_noncontent( ($side:ident, $get:ident, $inline_get:ident) => (
impl Box { impl Box {
pub fn $get(&self) -> Au { pub fn $get(&self) -> Au {
self.margin.get().$side + self.border.get().$side + self.padding.get().$side self.border.get().$side + self.padding.get().$side
} }
pub fn $inline_get(&self) -> Au { pub fn $inline_get(&self) -> Au {
@ -317,7 +318,7 @@ macro_rules! def_noncontent( ($side:ident, $get:ident, $inline_get:ident) => (
match info.get() { match info.get() {
&Some(ref info) => { &Some(ref info) => {
for info in info.parent_info.iter() { for info in info.parent_info.iter() {
val = val + info.margin.$side + info.border.$side + info.padding.$side; val = val + info.border.$side + info.padding.$side;
} }
}, },
&None => {} &None => {}