github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-07-03 04:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix SVG Raw not being saved (#10492)

Browse Source
This commit is contained in:
Aitor Moreno 2026-07-01 14:08:54 +02:00 committed by GitHub
parent 665e8e018e
commit 851fde01c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
render-wasm/src/main.rs
View File

@ -733,7 +733,11 @@ pub extern "C" fn set_shape_svg_raw_content() -> Result<()> {
.map_err(|e| Error::RecoverableError(e.to_string()))?
.trim_end_matches('\0')
.to_string();
let render_state = get_render_state();
let font_manager = skia::FontMgr::from(render_state.fonts().font_provider().clone());
shape.set_svg_raw_content(svg_raw_content);
shape.update_svg_raw_content(font_manager);
});
Ok(())

14
render-wasm/src/render.rs
View File

@ -1398,7 +1398,7 @@ impl RenderState {
}
match &shape.shape_type {
Type::SVGRaw(sr) => {
Type::SVGRaw(_) => {
if let Some(svg_transform) = shape.svg_transform() {
matrix.pre_concat(&svg_transform);
}
@ -1410,17 +1410,7 @@ impl RenderState {
if let Some(svg) = shape.svg.as_ref() {
svg.render(self.surfaces.canvas_and_mark_dirty(fills_surface_id));
} else {
let font_manager = skia::FontMgr::from(self.fonts().font_provider().clone());
let dom_result = skia::svg::Dom::from_str(&sr.content, font_manager);
match dom_result {
Ok(dom) => {
dom.render(self.surfaces.canvas_and_mark_dirty(fills_surface_id));
shape.to_mut().set_svg(dom);
}
Err(e) => {
eprintln!("Error parsing SVG. Error: {}", e);
}
}
panic!("SVG should be available");
}
}

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

@ -722,6 +722,23 @@ impl Shape {
self.invalidate_extrect();
}
pub fn update_svg_raw_content(&mut self, font_manager: skia::FontMgr) {
match &self.shape_type {
Type::SVGRaw(sr) => {
let dom_result = skia::svg::Dom::from_str(&sr.content, font_manager);
match dom_result {
Ok(dom) => {
self.set_svg(dom);
}
Err(e) => {
eprintln!("Error parsing SVG. Error: {}", e);
}
}
}
_ => panic!("Updating SVG raw content on non SVG Raw shape"),
}
}
pub fn set_svg_raw_content(&mut self, content: String) {
self.shape_type = Type::SVGRaw(SVGRaw::from_content(content));
}