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

Add dotted border support.

Browse source
This commit is contained in:
Bryan Bell 2014-05-14 18:59:27 -07:00
parent 309c9db2ac
commit d570b80b6b
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/components/gfx/render_context.rs
View file

@ -38,6 +38,11 @@ enum Direction {
Bottom Bottom
} }
enum DashSize {
DottedBorder = 1,
DashedBorder = 3
}
impl<'a> RenderContext<'a> { impl<'a> RenderContext<'a> {
pub fn get_draw_target(&self) -> &'a DrawTarget { pub fn get_draw_target(&self) -> &'a DrawTarget {
self.draw_target self.draw_target
@ -146,9 +151,10 @@ impl<'a> RenderContext<'a> {
} }
//FIXME(sammykim): This doesn't work with dash_pattern and cap_style well. I referred firefox code. //FIXME(sammykim): This doesn't work with dash_pattern and cap_style well. I referred firefox code.
border_style::dotted => { border_style::dotted => {
self.draw_dashed_border_segment(direction, bounds, border, color_select, DottedBorder);
} }
border_style::dashed => { border_style::dashed => {
self.draw_dashed_border_segment(direction,bounds,border,color_select); self.draw_dashed_border_segment(direction, bounds, border, color_select, DashedBorder);
} }
border_style::solid => { border_style::solid => {
self.draw_solid_border_segment(direction,bounds,border,color_select); self.draw_solid_border_segment(direction,bounds,border,color_select);
@ -164,10 +170,10 @@ impl<'a> RenderContext<'a> {
match style{ match style{
border_style::none | border_style::hidden => {} border_style::none | border_style::hidden => {}
border_style::dotted => { border_style::dotted => {
//FIXME(sankha93): Dotted style should be implemented. self.draw_dashed_border_segment(Right, bounds, border, color, DottedBorder);
} }
border_style::dashed => { border_style::dashed => {
self.draw_dashed_border_segment(Right,bounds,border,color); self.draw_dashed_border_segment(Right, bounds, border, color, DashedBorder);
} }
border_style::solid => { border_style::solid => {
self.draw_solid_border_segment(Right,bounds,border,color); self.draw_solid_border_segment(Right,bounds,border,color);
@ -177,7 +183,12 @@ impl<'a> RenderContext<'a> {
} }
} }
fn draw_dashed_border_segment(&self, direction: Direction, bounds: &Rect<Au>, border: SideOffsets2D<f32>, color: Color) { fn draw_dashed_border_segment(&self,
direction: Direction,
bounds: &Rect<Au>,
border: SideOffsets2D<f32>,
color: Color,
dash_size: DashSize) {
let rect = bounds.to_azure_rect(); let rect = bounds.to_azure_rect();
let draw_opts = DrawOptions(1 as AzFloat, 0 as uint16_t); let draw_opts = DrawOptions(1 as AzFloat, 0 as uint16_t);
let mut stroke_opts = StrokeOptions(0 as AzFloat, 10 as AzFloat); let mut stroke_opts = StrokeOptions(0 as AzFloat, 10 as AzFloat);
@ -193,8 +204,8 @@ impl<'a> RenderContext<'a> {
}; };
stroke_opts.line_width = border_width; stroke_opts.line_width = border_width;
dash[0] = border_width * 3 as AzFloat; dash[0] = border_width * (dash_size as int) as AzFloat;
dash[1] = border_width * 3 as AzFloat; dash[1] = border_width * (dash_size as int) as AzFloat;
stroke_opts.mDashPattern = dash.as_ptr(); stroke_opts.mDashPattern = dash.as_ptr();
stroke_opts.mDashLength = dash.len() as size_t; stroke_opts.mDashLength = dash.len() as size_t;

2
src/test/html/test_border.html
View file

@ -48,7 +48,7 @@
<div id="solid"> solid test</div> <div id="solid"> solid test</div>
<div id="dashed"> dashed test</div> <div id="dashed"> dashed test</div>
<!-- It doesn't show anything yet. --> <!-- It doesn't show anything yet. -->
<div id="dotted"> dotted test. (dotted isn't supported yet)</div> <div id="dotted"> dotted test</div>
<!-- It's a Diamond --> <!-- It's a Diamond -->
<div id="diamond1"></div> <div id="diamond1"></div>
<div id="diamond2"></div> <div id="diamond2"></div>