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

implement svg text fix for native renderer

Browse source 
Signed-off-by: Cory Frenette <cory@frenette.dev>
This commit is contained in:
Cory Frenette 2023-12-10 22:12:46 -05:00
parent eaaea414b8
commit a2a96adf7a
No known key found for this signature in database
GPG key ID: 94FE37DB9A5ED41C
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,8 +2,9 @@ use crate::core::svg;
use crate::core::{Color, Size}; use crate::core::{Color, Size};
use crate::image::atlas::{self, Atlas}; use crate::image::atlas::{self, Atlas};
use iced_graphics::text;
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;
@ -51,11 +52,23 @@ impl Cache {
let svg = match handle.data() { let svg = match handle.data() {
svg::Data::Path(path) => { svg::Data::Path(path) => {
let tree = fs::read_to_string(path).ok().and_then(|contents| { let mut tree =
usvg::Tree::from_str(&contents, &usvg::Options::default()) fs::read_to_string(path).ok().and_then(|contents| {
usvg::Tree::from_str(
&contents,
&usvg::Options::default(),
)
.ok() .ok()
}); });
// If there are text nodes in the tree load fonts and convert the text to paths
if let Some(svg_tree) = &mut tree {
if svg_tree.has_text_nodes() {
let mut font_system = text::font_system()
.write()
.expect("Read font system");
svg_tree.convert_text(font_system.raw().db_mut());
}
}
tree.map(Svg::Loaded).unwrap_or(Svg::NotFound) tree.map(Svg::Loaded).unwrap_or(Svg::NotFound)
} }
svg::Data::Bytes(bytes) => { svg::Data::Bytes(bytes) => {