From f0b1e65ba4f8df173f8201585a1d81245e93ab94 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 13 Nov 2019 03:54:36 +0100 Subject: Move text logic in `iced_wgpu` to a `text` module --- wgpu/src/renderer/widget/text_input.rs | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'wgpu/src/renderer/widget/text_input.rs') diff --git a/wgpu/src/renderer/widget/text_input.rs b/wgpu/src/renderer/widget/text_input.rs index 75eb20f7..f37c879c 100644 --- a/wgpu/src/renderer/widget/text_input.rs +++ b/wgpu/src/renderer/widget/text_input.rs @@ -70,41 +70,26 @@ impl text_input::Renderer for Renderer { }; let (contents_primitive, offset) = if text_input.state.is_focused { - use wgpu_glyph::{GlyphCruncher, Scale, Section}; + use wgpu_glyph::{Scale, Section}; let text_before_cursor = &text_input .value .until(text_input.state.cursor_position(&text_input.value)) .to_string(); - let mut text_value_width = self - .text_measurements - .borrow_mut() - .glyph_bounds(Section { + let (mut text_value_width, _) = + self.text_pipeline.measure(&Section { text: text_before_cursor, bounds: (f32::INFINITY, text_bounds.height), scale: Scale { x: size, y: size }, ..Default::default() - }) - .map(|bounds| bounds.width().round()) - .unwrap_or(0.0); + }); let spaces_at_the_end = text_before_cursor.len() - text_before_cursor.trim_end().len(); if spaces_at_the_end > 0 { - let space_width = { - let glyph_brush = self.text_measurements.borrow(); - - // TODO: Select appropriate font - let font = &glyph_brush.fonts()[0]; - - font.glyph(' ') - .scaled(Scale { x: size, y: size }) - .h_metrics() - .advance_width - }; - + let space_width = self.text_pipeline.space_width(size); text_value_width += spaces_at_the_end as f32 * space_width; } -- cgit From 6857829dc3171fd68065498b6cd29f0ef02a8d43 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 13 Nov 2019 07:22:21 +0100 Subject: Draft `Font` type and implement `Text::font` --- wgpu/src/renderer/widget/text_input.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'wgpu/src/renderer/widget/text_input.rs') diff --git a/wgpu/src/renderer/widget/text_input.rs b/wgpu/src/renderer/widget/text_input.rs index f37c879c..855e945c 100644 --- a/wgpu/src/renderer/widget/text_input.rs +++ b/wgpu/src/renderer/widget/text_input.rs @@ -2,7 +2,7 @@ use crate::{Primitive, Renderer}; use iced_native::{ text::HorizontalAlignment, text::VerticalAlignment, text_input, Background, - Color, MouseCursor, Point, Rectangle, TextInput, Vector, + Color, Font, MouseCursor, Point, Rectangle, Size, TextInput, Vector, }; use std::f32; @@ -60,6 +60,7 @@ impl text_input::Renderer for Renderer { [0.3, 0.3, 0.3] } .into(), + font: Font::Default, bounds: Rectangle { width: f32::INFINITY, ..text_bounds @@ -70,20 +71,17 @@ impl text_input::Renderer for Renderer { }; let (contents_primitive, offset) = if text_input.state.is_focused { - use wgpu_glyph::{Scale, Section}; - let text_before_cursor = &text_input .value .until(text_input.state.cursor_position(&text_input.value)) .to_string(); - let (mut text_value_width, _) = - self.text_pipeline.measure(&Section { - text: text_before_cursor, - bounds: (f32::INFINITY, text_bounds.height), - scale: Scale { x: size, y: size }, - ..Default::default() - }); + let (mut text_value_width, _) = self.text_pipeline.measure( + text_before_cursor, + size, + Font::Default, + Size::new(f32::INFINITY, text_bounds.height), + ); let spaces_at_the_end = text_before_cursor.len() - text_before_cursor.trim_end().len(); -- cgit