Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pbr = "1.0"
prettytable-rs = "0.10"

[target.'cfg(target_family = "windows")'.dependencies]
dwrote = { version = "0.11", default-features = false }
dwrote = { version = "^0.11.3", default-features = false }

[target.'cfg(target_family = "windows")'.dependencies.winapi]
version = "0.3"
Expand Down
4 changes: 3 additions & 1 deletion src/loaders/directwrite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,9 @@ impl Font {
font_index -= 1;
continue;
}
let dwrite_font = family.get_font(family_font_index);
let Ok(dwrite_font) = family.font(family_font_index) else {
continue;
};
let dwrite_font_face = dwrite_font.create_font_face();
return Ok(Font {
dwrite_font,
Expand Down
21 changes: 11 additions & 10 deletions src/sources/directwrite.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ impl DirectWriteSource {

for dwrite_family in self.system_font_collection.families_iter() {
for font_index in 0..dwrite_family.get_font_count() {
let dwrite_font = dwrite_family.get_font(font_index);
let Ok(dwrite_font) = dwrite_family.font(font_index) else {
continue;
};
handles.push(self.create_handle_from_dwrite_font(dwrite_font))
}
}
Expand All @@ -54,7 +56,7 @@ impl DirectWriteSource {
Ok(self
.system_font_collection
.families_iter()
.map(|dwrite_family| dwrite_family.name())
.filter_map(|dwrite_family| dwrite_family.family_name().ok())
.collect())
}

Expand All @@ -63,16 +65,15 @@ impl DirectWriteSource {
/// TODO(pcwalton): Case-insensitivity.
pub fn select_family_by_name(&self, family_name: &str) -> Result<FamilyHandle, SelectionError> {
let mut family = FamilyHandle::new();
let dwrite_family = match self
.system_font_collection
.get_font_family_by_name(family_name)
{
Some(dwrite_family) => dwrite_family,
None => return Err(SelectionError::NotFound),
let dwrite_family = match self.system_font_collection.font_family_by_name(family_name) {
Ok(Some(dwrite_family)) => dwrite_family,
Err(_) | Ok(None) => return Err(SelectionError::NotFound),
};
for font_index in 0..dwrite_family.get_font_count() {
let dwrite_font = dwrite_family.get_font(font_index);
family.push(self.create_handle_from_dwrite_font(dwrite_font))
let Ok(dwrite_font) = dwrite_family.font(font_index) else {
continue;
};
family.push(self.create_handle_from_dwrite_font(dwrite_font));
}
Ok(family)
}
Expand Down