3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-13 23:17:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix rounded corners in image fill

Browse source
This commit is contained in:
elenatorro 2025-03-10 11:37:49 +01:00
parent 390cf6b642
commit ac8b5a7bcc
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
render-wasm/src/render/fills.rs
View file

@ -1,8 +1,8 @@
use skia_safe::{self as skia, RRect}; use skia_safe::{self as skia, RRect};
use super::{RenderState, SurfaceId}; use super::{RenderState, SurfaceId};
use crate::math::Rect; use crate::math::Rect as MathRect;
use crate::shapes::{Fill, ImageFill, Shape, Type}; use crate::shapes::{Fill, Frame, ImageFill, Rect, Shape, Type};
fn draw_image_fill_in_container( fn draw_image_fill_in_container(
render_state: &mut RenderState, render_state: &mut RenderState,
@ -43,7 +43,7 @@ fn draw_image_fill_in_container(
let scaled_width = width * scale; let scaled_width = width * scale;
let scaled_height = height * scale; let scaled_height = height * scale;
let dest_rect = Rect::from_xywh( let dest_rect = MathRect::from_xywh(
container.left - (scaled_width - container_width) / 2.0, container.left - (scaled_width - container_width) / 2.0,
container.top - (scaled_height - container_height) / 2.0, container.top - (scaled_height - container_height) / 2.0,
scaled_width, scaled_width,
@ -55,6 +55,16 @@ fn draw_image_fill_in_container(
// Set the clipping rectangle to the container bounds // Set the clipping rectangle to the container bounds
match &shape.shape_type { match &shape.shape_type {
Type::Rect(Rect {
corners: Some(corners),
})
| Type::Frame(Frame {
corners: Some(corners),
..
}) => {
let rrect: RRect = RRect::new_rect_radii(container, &corners);
canvas.clip_rrect(rrect, skia::ClipOp::Intersect, true);
}
Type::Rect(_) | Type::Frame(_) => { Type::Rect(_) | Type::Frame(_) => {
canvas.clip_rect(container, skia::ClipOp::Intersect, true); canvas.clip_rect(container, skia::ClipOp::Intersect, true);
} }