Merge branch 'master' into feature/canvas-interaction

2020-04-29 07:34:14 +02:00 · 2020-04-29 07:34:14 +02:00 · 61c707fe04
commit 61c707fe04
parent dc51080328 e0aa89cee7
18 changed files with 147 additions and 39 deletions
--- 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(