me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2161 from cfrenette/bug/svg-text-not-rendered

Browse source 
Implement a fix for the native renderer not rendering text in SVGs
This commit is contained in:
Héctor Ramón 2023-12-11 10:56:34 +01:00 • committed by GitHub
commit 78689687ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tiny_skia/src/vector.rs
View file

@ -96,7 +96,7 @@ impl Cache {
if let Some(svg) = &mut svg { if let Some(svg) = &mut svg {
if svg.has_text_nodes() { if svg.has_text_nodes() {
let mut font_system = let mut font_system =
text::font_system().write().expect("Read font system"); text::font_system().write().expect("Write font system");
svg.convert_text(font_system.raw().db_mut()); svg.convert_text(font_system.raw().db_mut());
} }

26
wgpu/src/image/vector.rs
View file

@ -1,9 +1,10 @@
use crate::core::svg; use crate::core::svg;
use crate::core::{Color, Size}; use crate::core::{Color, Size};
use crate::graphics::text;
use crate::image::atlas::{self, Atlas}; use crate::image::atlas::{self, Atlas};
use resvg::tiny_skia; use resvg::tiny_skia;
use resvg::usvg; use resvg::usvg::{self, TreeTextToPath};
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::fs; use std::fs;
@ -49,15 +50,15 @@ impl Cache {
return self.svgs.get(&handle.id()).unwrap(); return self.svgs.get(&handle.id()).unwrap();
} }
let svg = match handle.data() { let mut svg = match handle.data() {
svg::Data::Path(path) => { svg::Data::Path(path) => fs::read_to_string(path)
let tree = fs::read_to_string(path).ok().and_then(|contents| { .ok()
.and_then(|contents| {
usvg::Tree::from_str(&contents, &usvg::Options::default()) usvg::Tree::from_str(&contents, &usvg::Options::default())
.ok() .ok()
}); })
.map(Svg::Loaded)
tree.map(Svg::Loaded).unwrap_or(Svg::NotFound) .unwrap_or(Svg::NotFound),
}
svg::Data::Bytes(bytes) => { svg::Data::Bytes(bytes) => {
match usvg::Tree::from_data(bytes, &usvg::Options::default()) { match usvg::Tree::from_data(bytes, &usvg::Options::default()) {
Ok(tree) => Svg::Loaded(tree), Ok(tree) => Svg::Loaded(tree),
@ -66,6 +67,15 @@ impl Cache {
} }
}; };
if let Svg::Loaded(svg) = &mut svg {
if svg.has_text_nodes() {
let mut font_system =
text::font_system().write().expect("Write font system");
svg.convert_text(font_system.raw().db_mut());
}
}
let _ = self.svgs.insert(handle.id(), svg); let _ = self.svgs.insert(handle.id(), svg);
self.svgs.get(&handle.id()).unwrap() self.svgs.get(&handle.id()).unwrap()
} }