summaryrefslogtreecommitdiffstats
path: root/wgpu/src/renderer/widget/text.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-11-13 03:54:36 +0100
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2019-11-13 03:54:36 +0100
commitf0b1e65ba4f8df173f8201585a1d81245e93ab94 (patch)
tree1e03a138846adc20ba072079e15f3454106ad2ec /wgpu/src/renderer/widget/text.rs
parent73f3c900071f950ea914652ca3f0002c1e173f61 (diff)
downloadiced-f0b1e65ba4f8df173f8201585a1d81245e93ab94.tar.gz
iced-f0b1e65ba4f8df173f8201585a1d81245e93ab94.tar.bz2
iced-f0b1e65ba4f8df173f8201585a1d81245e93ab94.zip
Move text logic in `iced_wgpu` to a `text` module
Diffstat (limited to 'wgpu/src/renderer/widget/text.rs')
-rw-r--r--wgpu/src/renderer/widget/text.rs10
1 files changed, 2 insertions, 8 deletions
diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs
index b9ccd787..65b23c5e 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/wgpu/src/renderer/widget/text.rs
@@ -1,7 +1,7 @@
use crate::{Primitive, Renderer};
use iced_native::{layout, text, Color, Layout, MouseCursor, Size, Text};
-use wgpu_glyph::{GlyphCruncher, Section};
+use wgpu_glyph::Section;
use std::f32;
@@ -21,13 +21,7 @@ impl text::Renderer for Renderer {
..Default::default()
};
- let (width, height) = if let Some(bounds) =
- self.text_measurements.borrow_mut().glyph_bounds(&section)
- {
- (bounds.width().ceil(), bounds.height().ceil())
- } else {
- (0.0, 0.0)
- };
+ let (width, height) = self.text_pipeline.measure(&section);
let size = limits.resolve(Size::new(width, height));