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

Merge pull request #6126 from penpot/elenatorro-10516-fix-stroke-shadows

Browse source 
🐛 Fix stroke shadows
This commit is contained in:
Alejandro 2025-03-28 09:54:39 +01:00 • committed by GitHub
commit bd5e47f5fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 122 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

85
render-wasm/src/shapes/shadows.rs
View file

@ -1,4 +1,4 @@
use skia_safe::{self as skia, image_filters, ImageFilter};
use skia_safe::{self as skia, image_filters, ImageFilter, Paint};
use super::Color;
@ -62,75 +62,8 @@ impl Shadow {
self.hidden
}
pub fn to_paint(&self, scale: f32, antialias: bool) -> skia::Paint {
let mut paint = skia::Paint::default();
let image_filter = match self.style {
ShadowStyle::Drop => self.drop_shadow_filters(scale),
ShadowStyle::Inner => self.inner_shadow_filters(scale),
};
paint.set_image_filter(image_filter);
paint.set_anti_alias(antialias);
paint
}
// To be removed: Old methods for Drop Shadows and Inner Shadows (now used opnly for stroke shadows)
fn drop_shadow_filters(&self, scale: f32) -> Option<ImageFilter> {
let mut filter = image_filters::drop_shadow_only(
(self.offset.0 * scale, self.offset.1 * scale),
(self.blur * scale, self.blur * scale),
self.color,
None,
None,
None,
);
if self.spread > 0. {
filter =
image_filters::dilate((self.spread * scale, self.spread * scale), filter, None);
}
filter
}
fn inner_shadow_filters(&self, scale: f32) -> Option<ImageFilter> {
let sigma = self.blur * 0.5;
let mut filter = skia::image_filters::drop_shadow_only(
(self.offset.0 * scale, self.offset.1 * scale), // DPR?
(sigma * scale, sigma * scale),
skia::Color::BLACK,
None,
None,
None,
);
filter = skia::image_filters::color_filter(
skia::color_filters::blend(self.color, skia::BlendMode::SrcOut).unwrap(),
filter,
None,
);
if self.spread > 0. {
filter = skia::image_filters::dilate(
(self.spread * scale, self.spread * scale),
filter,
None,
);
}
filter = skia::image_filters::blend(skia::BlendMode::SrcIn, None, filter, None);
filter
}
// New methods for Drop Shadows
pub fn get_drop_shadow_paint(&self, antialias: bool) -> skia::Paint {
let mut paint = skia::Paint::default();
pub fn get_drop_shadow_paint(&self, antialias: bool) -> Paint {
let mut paint = Paint::default();
let image_filter = self.get_drop_shadow_filter();
paint.set_image_filter(image_filter);
@ -139,7 +72,7 @@ impl Shadow {
paint
}
fn get_drop_shadow_filter(&self) -> Option<ImageFilter> {
pub fn get_drop_shadow_filter(&self) -> Option<ImageFilter> {
let mut filter = image_filters::drop_shadow_only(
(self.offset.0, self.offset.1),
(self.blur, self.blur),
@ -156,10 +89,8 @@ impl Shadow {
filter
}
// New methods for Inner Shadows
pub fn get_inner_shadow_paint(&self, antialias: bool) -> skia::Paint {
let mut paint = skia::Paint::default();
pub fn get_inner_shadow_paint(&self, antialias: bool) -> Paint {
let mut paint = Paint::default();
let image_filter = self.get_inner_shadow_filter();
@ -169,12 +100,12 @@ impl Shadow {
paint
}
fn get_inner_shadow_filter(&self) -> Option<ImageFilter> {
pub fn get_inner_shadow_filter(&self) -> Option<ImageFilter> {
let sigma = self.blur * 0.5;
let mut filter = skia::image_filters::drop_shadow_only(
(self.offset.0, self.offset.1), // DPR?
(sigma, sigma),
skia::Color::BLACK,
skia::Color::WHITE,
None,
None,
None,

6
render-wasm/src/shapes/strokes.rs
View file

@ -232,13 +232,13 @@ impl Stroke {
match self.render_kind(is_open) {
StrokeKind::InnerStroke => {
paint.set_stroke_width(2. * paint.stroke_width());
paint
}
StrokeKind::CenterStroke => paint,
StrokeKind::CenterStroke => {}
StrokeKind::OuterStroke => {
paint.set_stroke_width(2. * paint.stroke_width());
paint
}
}
paint
}
}