diff options
Diffstat (limited to '')
| -rw-r--r-- | wgpu/src/renderer.rs | 24 | ||||
| -rw-r--r-- | wgpu/src/renderer/widget/text.rs | 2 |
2 files changed, 14 insertions, 12 deletions
diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs index 5c38ce61..dccd0d82 100644 --- a/wgpu/src/renderer.rs +++ b/wgpu/src/renderer.rs @@ -355,6 +355,18 @@ impl Renderer { ) { let bounds = layer.bounds * scale_factor; + if !layer.quads.is_empty() { + self.quad_pipeline.draw( + device, + encoder, + &layer.quads, + transformation, + scale_factor, + bounds, + target, + ); + } + if !layer.meshes.is_empty() { let scaled = transformation * Transformation::scale(scale_factor, scale_factor); @@ -371,18 +383,6 @@ impl Renderer { ); } - if !layer.quads.is_empty() { - self.quad_pipeline.draw( - device, - encoder, - &layer.quads, - transformation, - scale_factor, - bounds, - target, - ); - } - #[cfg(any(feature = "image", feature = "svg"))] { if !layer.images.is_empty() { 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( |