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

Add style field to render them in RenderContext

Browse source
This commit is contained in:
Sangeun Kim 2013-08-26 15:19:44 +09:00
parent 0b0755b970
commit 03fb29e066
2 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/gfx/display_list.rs
View file

@ -16,6 +16,7 @@
use color::Color; use color::Color;
use geometry::Au; use geometry::Au;
use newcss::values::CSSBorderStyle;
use render_context::RenderContext; use render_context::RenderContext;
use text::SendableTextRun; use text::SendableTextRun;
@ -103,8 +104,11 @@ pub struct BorderDisplayItem<E> {
/// The border widths /// The border widths
border: SideOffsets2D<Au>, border: SideOffsets2D<Au>,
/// The color of the border. /// The border colors.
color: SideOffsets2D<Color>, color: SideOffsets2D<Color>,
/// The border styles.
style: SideOffsets2D<CSSBorderStyle>
} }
impl<E> DisplayItem<E> { impl<E> DisplayItem<E> {
@ -151,7 +155,8 @@ impl<E> DisplayItem<E> {
BorderDisplayItemClass(ref border) => { BorderDisplayItemClass(ref border) => {
render_context.draw_border(&border.base.bounds, render_context.draw_border(&border.base.bounds,
border.border, border.border,
border.color) border.color,
border.style)
} }
} }
} }

27
src/components/main/layout/box.rs
View file

@ -27,6 +27,7 @@ use newcss::color::rgb;
use newcss::complete::CompleteStyle; use newcss::complete::CompleteStyle;
use newcss::units::{Em, Px}; use newcss::units::{Em, Px};
use newcss::units::{Cursive, Fantasy, Monospace, SansSerif, Serif}; use newcss::units::{Cursive, Fantasy, Monospace, SansSerif, Serif};
use newcss::values::{CSSBorderStyleDashed, CSSBorderStyleSolid};
use newcss::values::{CSSClearNone, CSSClearLeft, CSSClearRight, CSSClearBoth}; use newcss::values::{CSSClearNone, CSSClearLeft, CSSClearRight, CSSClearBoth};
use newcss::values::{CSSFontFamilyFamilyName, CSSFontFamilyGenericFamily}; use newcss::values::{CSSFontFamilyFamilyName, CSSFontFamilyGenericFamily};
use newcss::values::{CSSFontSizeLength, CSSFontStyleItalic, CSSFontStyleNormal}; use newcss::values::{CSSFontSizeLength, CSSFontStyleItalic, CSSFontStyleNormal};
@ -637,7 +638,8 @@ impl RenderBox {
extra: ExtraDisplayListData::new(*self), extra: ExtraDisplayListData::new(*self),
}, },
border: debug_border, border: debug_border,
color: SideOffsets2D::new_all_same(rgb(0, 0, 200).to_gfx_color()) color: SideOffsets2D::new_all_same(rgb(0, 0, 200).to_gfx_color()),
style: SideOffsets2D::new_all_same(CSSBorderStyleSolid)
}; };
list.append_item(BorderDisplayItemClass(border_display_item)) list.append_item(BorderDisplayItemClass(border_display_item))
@ -658,7 +660,8 @@ impl RenderBox {
extra: ExtraDisplayListData::new(*self), extra: ExtraDisplayListData::new(*self),
}, },
border: debug_border, border: debug_border,
color: SideOffsets2D::new_all_same(rgb(0, 200, 0).to_gfx_color()) color: SideOffsets2D::new_all_same(rgb(0, 200, 0).to_gfx_color()),
style: SideOffsets2D::new_all_same(CSSBorderStyleDashed)
}; };
list.append_item(BorderDisplayItemClass(border_display_item)) list.append_item(BorderDisplayItemClass(border_display_item))
@ -684,7 +687,8 @@ impl RenderBox {
extra: ExtraDisplayListData::new(*self), extra: ExtraDisplayListData::new(*self),
}, },
border: debug_border, border: debug_border,
color: SideOffsets2D::new_all_same(rgb(0, 0, 200).to_gfx_color()) color: SideOffsets2D::new_all_same(rgb(0, 0, 200).to_gfx_color()),
style: SideOffsets2D::new_all_same(CSSBorderStyleSolid)
}; };
list.append_item(BorderDisplayItemClass(border_display_item)) list.append_item(BorderDisplayItemClass(border_display_item))
@ -915,11 +919,8 @@ impl RenderBox {
return return
} }
let top_color = self.style().border_top_color(); let (top_color, right_color, bottom_color, left_color) = (self.style().border_top_color(), self.style().border_right_color(), self.style().border_bottom_color(), self.style().border_left_color());
let right_color = self.style().border_right_color(); let (top_style, right_style, bottom_style, left_style) = (self.style().border_top_style(), self.style().border_right_style(), self.style().border_bottom_style(), self.style().border_left_style());
let bottom_color = self.style().border_bottom_color();
let left_color = self.style().border_left_color();
// Append the border to the display list. // Append the border to the display list.
do list.with_mut_ref |list| { do list.with_mut_ref |list| {
let border_display_item = ~BorderDisplayItem { let border_display_item = ~BorderDisplayItem {
@ -932,9 +933,13 @@ impl RenderBox {
border.bottom, border.bottom,
border.left), border.left),
color: SideOffsets2D::new(top_color.to_gfx_color(), color: SideOffsets2D::new(top_color.to_gfx_color(),
right_color.to_gfx_color(), right_color.to_gfx_color(),
bottom_color.to_gfx_color(), bottom_color.to_gfx_color(),
left_color.to_gfx_color()) left_color.to_gfx_color()),
style: SideOffsets2D::new(top_style,
right_style,
bottom_style,
left_style)
}; };
list.append_item(BorderDisplayItemClass(border_display_item)) list.append_item(BorderDisplayItemClass(border_display_item))