michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only paint text backgrounds up to the appropriate width in the NanoVG demo

This commit is contained in:
Patrick Walton 2020-04-09 12:33:16 -07:00
parent a196f1eff8
commit 19aa9c8e54
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
examples/canvas_nanovg/src/main.rs
View File

@ -278,9 +278,7 @@ fn render_multiline_text(context: &mut CanvasRenderingContext2D,
-> RectF { -> RectF {
let mut bounds = RectF::new(first_line_box.origin(), vec2f(0.0, 0.0)); let mut bounds = RectF::new(first_line_box.origin(), vec2f(0.0, 0.0));
let mut cursor = first_line_box.origin(); let mut cursor = first_line_box.lower_left();
next_line(context, &mut cursor, first_line_box, bg_color, &mut bounds);
let space_width = context.measure_text("A B").width - context.measure_text("AB").width; let space_width = context.measure_text("A B").width - context.measure_text("AB").width;
for space_separated in text.split(' ') { for space_separated in text.split(' ') {
@ -318,14 +316,15 @@ fn render_multiline_text(context: &mut CanvasRenderingContext2D,
first_line_box: RectF, first_line_box: RectF,
bg_color: ColorU, bg_color: ColorU,
bounds: &mut RectF) { bounds: &mut RectF) {
cursor.set_x(first_line_box.min_x()); let line_rect = RectF::from_points(vec2f(first_line_box.origin_x(),
let line_rect = RectF::new(*cursor, first_line_box.size()); cursor.y() - first_line_box.height()),
*cursor);
if !bg_color.is_fully_transparent() { if !bg_color.is_fully_transparent() {
context.set_fill_style(bg_color); context.set_fill_style(bg_color);
context.fill_rect(line_rect); context.fill_rect(line_rect);
} }
*bounds = bounds.union_rect(line_rect); *bounds = bounds.union_rect(line_rect);
*cursor += vec2f(0.0, first_line_box.height()); *cursor = vec2f(first_line_box.min_x(), cursor.y() + first_line_box.height());
} }
} }