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

Apply background colors to all box types

Browse source
This commit is contained in:
Brian Anderson 2012-10-15 15:02:23 -07:00
parent fc93bea3c6
commit c2567fb2f3
1 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/servo/layout/box.rs
View file

@ -320,12 +320,7 @@ impl RenderBox : RenderBoxMethods {
let bounds : Rect<au> = Rect(self.d().position.origin.add(offset),
copy self.d().position.size);
// TODO: shouldn't need to unbox CSSValue by now
let boxed_bgcolor = self.d().node.style().background_color;
let bgcolor = match boxed_bgcolor {
Specified(BgColor(c)) => c,
Specified(BgColorTransparent) | _ => util::color::rgba(0,0,0,0.0)
};
self.add_bgcolor_to_list(list, bounds);
match self {
UnscannedTextBox(*) => fail ~"Shouldn't see unscanned boxes here.",
@ -334,22 +329,29 @@ impl RenderBox : RenderBoxMethods {
},
// TODO: items for background, border, outline
GenericBox(_) => {
use std::cmp::FuzzyEq;
if !bgcolor.alpha.fuzzy_eq(&0.0) {
list.push(~dl::SolidColor(bounds, bgcolor.red, bgcolor.green, bgcolor.blue));
}
},
ImageBox(_,i) => {
match i.get_image() {
Some(image) => list.push(~dl::Image(bounds, arc::clone(&image))),
/* No image data at all? Okay, add some fallback content instead. */
None => {
list.push(~dl::SolidColor(bounds, bgcolor.red, bgcolor.green, bgcolor.blue));
}
None => ()
}
}
}
}
fn add_bgcolor_to_list(list: &dl::DisplayList, bounds: Rect<au>) {
use std::cmp::FuzzyEq;
// TODO: shouldn't need to unbox CSSValue by now
let boxed_bgcolor = self.d().node.style().background_color;
let bgcolor = match boxed_bgcolor {
Specified(BgColor(c)) => c,
Specified(BgColorTransparent) | _ => util::color::rgba(0,0,0,0.0)
};
if !bgcolor.alpha.fuzzy_eq(&0.0) {
list.push(~dl::SolidColor(bounds, bgcolor.red, bgcolor.green, bgcolor.blue));
}
}
}
impl RenderBox : BoxedDebugMethods {