leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make FontSystem not self-referencing

Browse source
This commit is contained in:
Edgar Geier 2023-03-12 10:23:54 +01:00
parent c4a8d521f6
commit bff5aaaea3
No known key found for this signature in database
GPG key ID: DE2B55319457EB56
7 changed files with 168 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/font/fallback/mod.rs
View file

@ -26,7 +26,7 @@ mod platform;
mod platform;
pub struct FontFallbackIter<'a> {
fonts: &'a [Arc<Font<'a>>],
fonts: &'a [Arc<Font>],
default_families: &'a [&'a str],
default_i: usize,
scripts: Vec<Script>,
@ -39,7 +39,7 @@ pub struct FontFallbackIter<'a> {
impl<'a> FontFallbackIter<'a> {
pub fn new(
fonts: &'a [Arc<Font<'a>>],
fonts: &'a [Arc<Font>],
default_families: &'a [&'a str],
scripts: Vec<Script>,
locale: &'a str,
@ -88,7 +88,7 @@ impl<'a> FontFallbackIter<'a> {
}
impl<'a> Iterator for FontFallbackIter<'a> {
type Item = &'a Arc<Font<'a>>;
type Item = &'a Arc<Font>;
fn next(&mut self) -> Option<Self::Item> {
while self.default_i < self.default_families.len() {
let default_family = self.default_families[self.default_i];