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

Make GenericBox display background colors again

Browse source
This commit is contained in:
Brian Anderson 2012-10-15 14:33:37 -07:00
parent d1caa74d44
commit fc93bea3c6
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -320,25 +320,31 @@ impl RenderBox : RenderBoxMethods {
let bounds : Rect<au> = Rect(self.d().position.origin.add(offset), let bounds : Rect<au> = Rect(self.d().position.origin.add(offset),
copy self.d().position.size); 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)
};
match self { match self {
UnscannedTextBox(*) => fail ~"Shouldn't see unscanned boxes here.", UnscannedTextBox(*) => fail ~"Shouldn't see unscanned boxes here.",
TextBox(_,d) => { TextBox(_,d) => {
list.push(~dl::Text(bounds, ~(copy *d.run), d.offset, d.length)) list.push(~dl::Text(bounds, ~(copy *d.run), d.offset, d.length))
}, },
// TODO: items for background, border, outline // TODO: items for background, border, outline
GenericBox(*) => { }, 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) => { ImageBox(_,i) => {
match i.get_image() { match i.get_image() {
Some(image) => list.push(~dl::Image(bounds, arc::clone(&image))), Some(image) => list.push(~dl::Image(bounds, arc::clone(&image))),
/* No image data at all? Okay, add some fallback content instead. */ /* No image data at all? Okay, add some fallback content instead. */
None => { None => {
// TODO: shouldn't need to unbox CSSValue by now list.push(~dl::SolidColor(bounds, bgcolor.red, bgcolor.green, bgcolor.blue));
let boxed_color = self.d().node.style().background_color;
let color = match boxed_color {
Specified(BgColor(c)) => c,
Specified(BgColorTransparent) | _ => util::color::rgba(0,0,0,0.0)
};
list.push(~dl::SolidColor(bounds, color.red, color.green, color.blue));
} }
} }
} }