summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-04-29 07:34:14 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-04-29 07:34:14 +0200
commit61c707fe044e7abc035f1a35697757f55f955417 (patch)
treed5c99fe78400bb51b2d97ebb9145e897e5f4473a /wgpu/src/renderer
parentdc51080328caa12d2b1fc02febc72cab70bb9f50 (diff)
parente0aa89cee764eebb1cb06f0b0653f82b337620ea (diff)
downloadiced-61c707fe044e7abc035f1a35697757f55f955417.tar.gz
iced-61c707fe044e7abc035f1a35697757f55f955417.tar.bz2
iced-61c707fe044e7abc035f1a35697757f55f955417.zip
Merge branch 'master' into feature/canvas-interaction
Diffstat (limited to 'wgpu/src/renderer')
-rw-r--r--wgpu/src/renderer/widget/text.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs
index 3cf32426..4a4ecef4 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/wgpu/src/renderer/widget/text.rs
@@ -7,6 +7,8 @@ use iced_native::{
use std::f32;
impl text::Renderer for Renderer {
+ type Font = Font;
+
const DEFAULT_SIZE: u16 = 20;
fn measure(