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

Basic implementation of canvas.fillText

Browse source
This commit is contained in:
Utsav Oza 2020-05-23 22:03:04 +05:30
parent 726f7d7209
commit f161ab8e57
2 changed files with 61 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

36
components/canvas/canvas_data.rs
View file

@ -264,6 +264,15 @@ pub trait GenericDrawTarget {
operator: CompositionOp,
);
fn fill(&mut self, path: &Path, pattern: Pattern, draw_options: &DrawOptions);
fn fill_text(
&mut self,
text: String,
x: f64,
y: f64,
max_width: Option<f64>,
pattern: Pattern,
draw_options: &DrawOptions,
);
fn fill_rect(&mut self, rect: &Rect<f32>, pattern: Pattern, draw_options: Option<&DrawOptions>);
fn get_format(&self) -> SurfaceFormat;
fn get_size(&self) -> Size2D<i32>;
@ -456,10 +465,29 @@ impl<'a> CanvasData<'a> {
}
}
pub fn fill_text(&self, text: String, x: f64, y: f64, max_width: Option<f64>) {
error!(
"Unimplemented canvas2d.fillText. Values received: {}, {}, {}, {:?}.",
text, x, y, max_width
pub fn fill_text(&mut self, text: String, x: f64, y: f64, max_width: Option<f64>) {
// 1. If maxWidth was provided but is less than or equal to zero or equal to NaN,
// then return an empty array.
if max_width.map_or(false, |max_width| max_width <= 0.) {
return;
}
// 2. Replace all ASCII whitespace in text with U+0020 SPACE characters.
let text = text
.chars()
.map(|c| match c {
' ' | '\t' | '\n' | '\r' | '\x0C' => '\x20',
_ => c,
})
.collect();
self.draw_target.fill_text(
text,
x,
y,
max_width,
self.state.fill_style.clone(),
&self.state.draw_options,
);
}