diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-10-31 04:43:29 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-10-31 04:43:53 +0100 |
| commit | d3cdee1d9bcd9f7fe22eeccce93ab5a26faf18e8 (patch) | |
| tree | de7e363a07cf3e06b82bc4e197a5b22abcc1166c /wgpu | |
| parent | 51a0e99097f9ecb63eeb7f2ea7c38089977eb4d0 (diff) | |
| download | iced-d3cdee1d9bcd9f7fe22eeccce93ab5a26faf18e8.tar.gz iced-d3cdee1d9bcd9f7fe22eeccce93ab5a26faf18e8.tar.bz2 iced-d3cdee1d9bcd9f7fe22eeccce93ab5a26faf18e8.zip | |
Render `TextInput` cursor inside the clipping area
Diffstat (limited to 'wgpu')
| -rw-r--r-- | wgpu/src/renderer/text_input.rs | 173 |
1 files changed, 87 insertions, 86 deletions
diff --git a/wgpu/src/renderer/text_input.rs b/wgpu/src/renderer/text_input.rs index f119ae6a..deb8eae7 100644 --- a/wgpu/src/renderer/text_input.rs +++ b/wgpu/src/renderer/text_input.rs @@ -57,99 +57,100 @@ impl text_input::Renderer for Renderer { let size = f32::from(text_input.size.unwrap_or(self.default_size())); let text = text_input.value.to_string(); - let value = Primitive::Clip { + let value = Primitive::Text { + content: if text.is_empty() { + text_input.placeholder.clone() + } else { + text.clone() + }, + color: if text.is_empty() { + Color { + r: 0.7, + g: 0.7, + b: 0.7, + a: 1.0, + } + } else { + Color { + r: 0.3, + g: 0.3, + b: 0.3, + a: 1.0, + } + }, + bounds: Rectangle { + width: f32::INFINITY, + ..text_bounds + }, + size, + horizontal_alignment: HorizontalAlignment::Left, + vertical_alignment: VerticalAlignment::Center, + }; + + let content = Primitive::Clip { bounds: text_bounds, offset: 0, - content: Box::new(Primitive::Text { - content: if text.is_empty() { - text_input.placeholder.clone() - } else { - text.clone() - }, - color: if text.is_empty() { - Color { - r: 0.7, - g: 0.7, - b: 0.7, - a: 1.0, - } - } else { - Color { - r: 0.3, - g: 0.3, - b: 0.3, - a: 1.0, - } - }, - bounds: Rectangle { - width: f32::INFINITY, - ..text_bounds - }, - size, - horizontal_alignment: HorizontalAlignment::Left, - vertical_alignment: VerticalAlignment::Center, + content: Box::new(if text_input.state.is_focused { + use wgpu_glyph::{GlyphCruncher, 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 + .glyph_brush + .borrow_mut() + .glyph_bounds(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.glyph_brush.borrow(); + + // TODO: Select appropriate font + let font = &glyph_brush.fonts()[0]; + + font.glyph(' ') + .scaled(Scale { x: size, y: size }) + .h_metrics() + .advance_width + }; + + text_value_width += spaces_at_the_end as f32 * space_width; + } + + let cursor = Primitive::Quad { + bounds: Rectangle { + x: text_bounds.x + text_value_width, + y: text_bounds.y, + width: 1.0, + height: text_bounds.height, + }, + background: Background::Color(Color::BLACK), + border_radius: 0, + }; + + Primitive::Group { + primitives: vec![value, cursor], + } + } else { + value }), }; ( Primitive::Group { - primitives: if text_input.state.is_focused { - use wgpu_glyph::{GlyphCruncher, 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 - .glyph_brush - .borrow_mut() - .glyph_bounds(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.glyph_brush.borrow(); - - // TODO: Select appropriate font - let font = &glyph_brush.fonts()[0]; - - font.glyph(' ') - .scaled(Scale { x: size, y: size }) - .h_metrics() - .advance_width - }; - - text_value_width += - spaces_at_the_end as f32 * space_width; - } - - let cursor = Primitive::Quad { - bounds: Rectangle { - x: text_bounds.x + text_value_width, - y: text_bounds.y, - width: 1.0, - height: text_bounds.height, - }, - background: Background::Color(Color::BLACK), - border_radius: 0, - }; - - vec![border, input, value, cursor] - } else { - vec![border, input, value] - }, + primitives: vec![border, input, content], }, if is_mouse_over { MouseCursor::Text |