summaryrefslogtreecommitdiffstats
path: root/wgpu/src/text.rs
diff options
context:
space:
mode:
Diffstat (limited to 'wgpu/src/text.rs')
-rw-r--r--wgpu/src/text.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index fa7fd5df..083d9d2b 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -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,
}
}