Skip to content

fix(skia renderer): add right border widths to rounded corners #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(skia renderer): add right border widths to rounded corners #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 66 additions & 13 deletions src/renderers/skia.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ use crate::math::{BoundingBox, Dimensions};
use crate::render_commands::{Custom, RenderCommand, RenderCommandConfig};
use crate::text::TextConfig;
use crate::{ClayLayoutScope, Color as ClayColor};

use skia_safe::{
Canvas, ClipOp, Color, Font, Image, Paint, Point, RRect, Rect, SamplingOptions, Typeface,
Canvas, ClipOp, Color, Font, Image, Paint, PaintCap, Point, RRect, Rect, SamplingOptions,
Typeface,
};

pub fn clay_to_skia_color(color: ClayColor) -> Color {
Expand Down Expand Up @@ -200,79 +202,130 @@ pub fn clay_skia_render<'a, CustomElementData: 'a>(
// For corner arcs, we draw strokes.
let mut stroke = Paint::default();
stroke.set_color(clay_to_skia_color(border.color));
stroke.set_stroke_width(1.0);

stroke.set_style(skia_safe::paint::Style::Stroke);
stroke.set_anti_alias(true);

// Helper to draw an arc.
let draw_corner_arc = |canvas: &Canvas,
center_x: f32,
center_y: f32,
radius: f32,
start_angle: f32,
sweep_angle: f32| {
let mut draw_corner_arc = |canvas: &Canvas,
center_x: f32,
center_y: f32,
radius: f32,
start_angle: f32,
sweep_angle: f32,
width: u16| {
let radius = radius - (width as f32 / 2.);
let arc_rect = Rect::from_xywh(
center_x - radius,
center_y - radius,
radius * 2.0,
radius * 2.0,
);

stroke.set_stroke_width(width as f32);
stroke.set_stroke_cap(PaintCap::Round);
canvas.draw_arc(arc_rect, start_angle, sweep_angle, false, &stroke);
};

if border.corner_radii.top_left > 0. {
// top-left: arc from 180 to 270 degrees.
let center_x = bb.x + border.corner_radii.top_left;
let center_y = bb.y + border.corner_radii.top_left;

draw_corner_arc(
canvas,
center_x,
center_y,
border.corner_radii.top_left,
180.0,
90.0,
90.0 / 2.,
border.width.left,
);

draw_corner_arc(
canvas,
center_x,
center_y,
border.corner_radii.top_left,
180.0 + 90.0 / 2.,
90.0 / 2.,
border.width.top,
);
}

if border.corner_radii.top_right > 0. {
// top-right: arc from 270 to 360 degrees.
let center_x = bb.x + bb.width - border.corner_radii.top_right;
let center_y = bb.y + border.corner_radii.top_right;

draw_corner_arc(
canvas,
center_x,
center_y,
border.corner_radii.top_right,
270.0,
90.0,
90.0 / 2.0,
border.width.top,
);
draw_corner_arc(
canvas,
center_x,
center_y,
border.corner_radii.top_right,
270.0 + 90. / 2.,
90.0 / 2.0,
border.width.right,
);
}

if border.corner_radii.bottom_left > 0. {
// bottom-left: arc from 90 to 180 degrees.
let center_x = bb.x + border.corner_radii.bottom_left;
let center_y = bb.y + bb.height - border.corner_radii.bottom_left;

draw_corner_arc(
canvas,
center_x,
center_y,
border.corner_radii.bottom_left,
90.0,
90.0,
90.0 / 2.,
border.width.bottom,
);

draw_corner_arc(
canvas,
center_x,
center_y,
border.corner_radii.bottom_left,
90.0 + 90. / 2.,
90.0 / 2.,
border.width.left,
);
}

if border.corner_radii.bottom_right > 0. {
// bottom-right: arc from 0 to 90 degrees.
let center_x = bb.x + bb.width - border.corner_radii.bottom_right;
let center_y = bb.y + bb.height - border.corner_radii.bottom_right;

draw_corner_arc(
canvas,
center_x,
center_y,
border.corner_radii.bottom_right,
0.0,
90.0,
0.,
90.0 / 2.,
border.width.right,
);
draw_corner_arc(
canvas,
center_x,
center_y,
border.corner_radii.bottom_right,
90.0 / 2.,
90.0 / 2.,
border.width.bottom,
);
}
}
Expand Down
Loading