summaryrefslogtreecommitdiffstats
path: root/wgpu/src/text.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-04-08 04:47:54 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2023-04-08 04:47:54 +0200
commit3ee367355d4534d4eabcf2b135d64dc405984aa4 (patch)
treeb4ed4d110d9204500a1e735b989341ba09e9aff5 /wgpu/src/text.rs
parent940a47eafd098dce3567a95c38dc8697b0fc7115 (diff)
parentc0431aedd3bbef4161456f2fa5f29866e8f17fc5 (diff)
downloadiced-3ee367355d4534d4eabcf2b135d64dc405984aa4.tar.gz
iced-3ee367355d4534d4eabcf2b135d64dc405984aa4.tar.bz2
iced-3ee367355d4534d4eabcf2b135d64dc405984aa4.zip
Merge branch 'advanced-text' into incremental-rendering
Diffstat (limited to 'wgpu/src/text.rs')
-rw-r--r--wgpu/src/text.rs17
1 files changed, 7 insertions, 10 deletions
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index dd674279..f01e0b42 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -58,8 +58,12 @@ impl Pipeline {
target_size: Size<u32>,
) -> bool {
if self.renderers.len() <= self.prepare_layer {
- self.renderers
- .push(glyphon::TextRenderer::new(device, queue));
+ self.renderers.push(glyphon::TextRenderer::new(
+ &mut self.atlas,
+ device,
+ Default::default(),
+ None,
+ ));
}
let font_system = self.font_system.get_mut();
@@ -359,14 +363,7 @@ impl Cache {
glyphon::Attrs::new()
.family(to_family(key.font.family))
.weight(to_weight(key.font.weight))
- .stretch(to_stretch(key.font.stretch))
- .monospaced(
- key.font.monospaced
- || matches!(
- key.font.family,
- font::Family::Monospace
- ),
- ),
+ .stretch(to_stretch(key.font.stretch)),
);
let _ = entry.insert(buffer);