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

Overhaul Font type to allow font family selection

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-02-04 07:33:33 +01:00
parent a7580e0696
commit b29de28d1f
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
25 changed files with 147 additions and 256 deletions
Download patch file Download diff file Expand all files Collapse all files

10
wgpu/src/text.rs
View file

@ -112,8 +112,6 @@ impl Pipeline {
device: &wgpu::Device,
queue: &wgpu::Queue,
format: wgpu::TextureFormat,
_default_font: Option<&[u8]>,
_multithreading: bool,
) -> Self {
Pipeline {
renderers: Vec::new(),
@ -316,7 +314,11 @@ impl Pipeline {
fn to_family(font: Font) -> glyphon::Family<'static> {
match font {
Font::Default => glyphon::Family::SansSerif,
Font::External { name, .. } => glyphon::Family::Name(name),
Font::Name(name) => glyphon::Family::Name(name),
Font::SansSerif => glyphon::Family::SansSerif,
Font::Serif => glyphon::Family::Serif,
Font::Cursive => glyphon::Family::Cursive,
Font::Fantasy => glyphon::Family::Fantasy,
Font::Monospace => glyphon::Family::Monospace,
}
}