johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-11 22:14:05 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

✨ Improve setting svg attrs in wasm

Browse Source
This commit is contained in:
Alejandro Alonso
2025-10-23 14:22:22 +02:00
committed by Alonso Torres
parent dba718b850
commit 479ce99b32
14 changed files with 1554 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
render-wasm/src/shapes.rs
View File

@@ -21,6 +21,7 @@ mod rects;
mod shadows;
mod shape_to_path;
mod strokes;
mod svg_attrs;
mod svgraw;
mod text;
pub mod text_paths;
@@ -41,6 +42,7 @@ pub use rects::*;
pub use shadows::*;
pub use shape_to_path::*;
pub use strokes::*;
pub use svg_attrs::*;
pub use svgraw::*;
pub use text::*;
pub use transform::*;
@@ -174,7 +176,7 @@ pub struct Shape {
pub opacity: f32,
pub hidden: bool,
pub svg: Option<skia::svg::Dom>,
pub svg_attrs: HashMap<String, String>,
pub svg_attrs: SvgAttrs,
pub shadows: Vec<Shadow>,
pub layout_item: Option<LayoutItem>,
pub extrect: OnceCell<math::Rect>,
@@ -201,7 +203,7 @@ impl Shape {
hidden: false,
blur: None,
svg: None,
svg_attrs: HashMap::new(),
svg_attrs: SvgAttrs::default(),
shadows: Vec::with_capacity(1),
layout_item: None,
extrect: OnceCell::new(),
@@ -566,15 +568,6 @@ impl Shape {
};
}
pub fn set_path_attr(&mut self, name: String, value: String) {
match self.shape_type {
Type::Path(_) | Type::Bool(_) => {
self.set_svg_attr(name, value);
}
_ => unreachable!("This shape should have path attrs"),
};
}
pub fn set_svg_raw_content(&mut self, content: String) -> Result<(), String> {
self.shape_type = Type::SVGRaw(SVGRaw::from_content(content));
Ok(())
@@ -607,10 +600,6 @@ impl Shape {
self.svg = Some(svg);
}
pub fn set_svg_attr(&mut self, name: String, value: String) {
self.svg_attrs.insert(name, value);
}
pub fn blend_mode(&self) -> BlendMode {
self.blend_mode
}
@@ -1104,7 +1093,7 @@ impl Shape {
if let Some(path_transform) = self.to_path_transform() {
skia_path.transform(&path_transform);
}
if let Some("evenodd") = self.svg_attrs.get("fill-rule").map(String::as_str) {
if self.svg_attrs.fill_rule == FillRule::Evenodd {
skia_path.set_fill_type(skia::PathFillType::EvenOdd);
}
Some(skia_path)