Added font support for SVG text (#1850)

* Added font support for SVG text * Updated changelog * Added PR link to changelog Co-authored-by: Colin Rofls <[email protected]>
linebender · Jul 14, 2021 · bb04818 · bb04818
1 parent e473150
commit bb04818
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ You can find its changes [documented below](#070---2021-01-01).
 
 ### Added
 
+- System fonts loaded so that SVG images render text ([#1850] by [@DrGabble])
 - Add `scroll()` method in WidgetExt ([#1600] by [@totsteps])
 - `write!` for `RichTextBuilder` ([#1596] by [@Maan2003])
 - Sub windows: Allow opening windows that share state with arbitrary parts of the widget hierarchy ([#1254] by [@rjwittams])
@@ -497,6 +498,7 @@ Last release without a changelog :(
 [@r-ml]: https://github.com/r-ml
 [@djeedai]: https://github.com/djeedai
 [@bjorn]: https://github.com/bjorn
+[@DrGabble]: https://github.com/DrGabble
 [@lisael]: https://github.com/lisael
 
 [#599]: https://github.com/linebender/druid/pull/599
@@ -748,6 +750,7 @@ Last release without a changelog :(
 [#1820]: https://github.com/linebender/druid/pull/1820
 [#1825]: https://github.com/linebender/druid/pull/1825
 [#1843]: https://github.com/linebender/druid/pull/1843
+[#1850]: https://github.com/linebender/druid/pull/1850
 [#1851]: https://github.com/linebender/druid/pull/1851
 [#1860]: https://github.com/linebender/druid/pull/1860
 [#1861]: https://github.com/linebender/druid/pull/1861

diff --git a/druid/src/widget/svg.rs b/druid/src/widget/svg.rs
@@ -201,11 +201,13 @@ impl FromStr for SvgData {
     type Err = Box<dyn Error>;
 
     fn from_str(svg_str: &str) -> Result<Self, Self::Err> {
-        let re_opt = usvg::Options {
+        let mut re_opt = usvg::Options {
             keep_named_groups: false,
             ..usvg::Options::default()
         };
 
+        re_opt.fontdb.load_system_fonts();
+
         match usvg::Tree::from_str(svg_str, &re_opt) {
             Ok(tree) => Ok(SvgData {
                 tree: Arc::new(tree),