From 63cd0fd8eb1eebae8de7d5141c846fc4ea55d702 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 30 Oct 2019 03:31:07 +0100 Subject: Draft `TextInput` widget structure Also started a `todos` example to showcase it! --- wgpu/src/renderer.rs | 22 +++++---- wgpu/src/renderer/scrollable.rs | 12 ++--- wgpu/src/renderer/text_input.rs | 100 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 16 deletions(-) create mode 100644 wgpu/src/renderer/text_input.rs (limited to 'wgpu') diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs index a70693af..fbc39327 100644 --- a/wgpu/src/renderer.rs +++ b/wgpu/src/renderer.rs @@ -23,6 +23,7 @@ mod row; mod scrollable; mod slider; mod text; +mod text_input; pub struct Renderer { surface: Surface, @@ -148,7 +149,8 @@ impl Renderer { }); let mut layers = Vec::new(); - let mut current = Layer::new( + + layers.push(Layer::new( Rectangle { x: 0, y: 0, @@ -156,10 +158,9 @@ impl Renderer { height: u32::from(target.height), }, 0, - ); + )); - self.draw_primitive(primitive, &mut current, &mut layers); - layers.push(current); + self.draw_primitive(primitive, &mut layers); for layer in layers { self.flush( @@ -178,15 +179,16 @@ impl Renderer { fn draw_primitive<'a>( &mut self, primitive: &'a Primitive, - layer: &mut Layer<'a>, layers: &mut Vec>, ) { + let layer = layers.last_mut().unwrap(); + match primitive { Primitive::None => {} Primitive::Group { primitives } => { // TODO: Inspect a bit and regroup (?) for primitive in primitives { - self.draw_primitive(primitive, layer, layers) + self.draw_primitive(primitive, layers) } } Primitive::Text { @@ -275,7 +277,7 @@ impl Renderer { offset, content, } => { - let mut new_layer = Layer::new( + let clip_layer = Layer::new( Rectangle { x: bounds.x as u32, y: bounds.y as u32 - layer.y_offset, @@ -285,8 +287,12 @@ impl Renderer { layer.y_offset + offset, ); + let new_layer = Layer::new(layer.bounds, layer.y_offset); + + layers.push(clip_layer); + // TODO: Primitive culling - self.draw_primitive(content, &mut new_layer, layers); + self.draw_primitive(content, layers); layers.push(new_layer); } diff --git a/wgpu/src/renderer/scrollable.rs b/wgpu/src/renderer/scrollable.rs index 7bce3a68..e9dfc760 100644 --- a/wgpu/src/renderer/scrollable.rs +++ b/wgpu/src/renderer/scrollable.rs @@ -56,7 +56,7 @@ impl scrollable::Renderer for Renderer { let (content, mouse_cursor) = scrollable.content.draw(self, content, cursor_position); - let primitive = Primitive::Clip { + let clip = Primitive::Clip { bounds, offset, content: Box::new(content), @@ -107,19 +107,15 @@ impl scrollable::Renderer for Renderer { }; Primitive::Group { - primitives: vec![ - primitive, - scrollbar_background, - scrollbar, - ], + primitives: vec![clip, scrollbar_background, scrollbar], } } else { Primitive::Group { - primitives: vec![primitive, scrollbar], + primitives: vec![clip, scrollbar], } } } else { - primitive + clip }, if is_mouse_over_scrollbar || scrollable.state.is_scrollbar_grabbed() diff --git a/wgpu/src/renderer/text_input.rs b/wgpu/src/renderer/text_input.rs new file mode 100644 index 00000000..bcb55d50 --- /dev/null +++ b/wgpu/src/renderer/text_input.rs @@ -0,0 +1,100 @@ +use crate::{Primitive, Renderer}; + +use iced_native::{ + text::HorizontalAlignment, text::VerticalAlignment, text_input, Background, + Color, MouseCursor, Point, Rectangle, TextInput, +}; +use std::f32; + +impl text_input::Renderer for Renderer { + fn default_size(&self) -> u16 { + // TODO: Make this configurable + 20 + } + + fn draw( + &mut self, + text_input: &TextInput, + bounds: Rectangle, + text_bounds: Rectangle, + cursor_position: Point, + ) -> Self::Output { + let is_mouse_over = bounds.contains(cursor_position); + + let border = Primitive::Quad { + bounds, + background: Background::Color(if is_mouse_over { + Color { + r: 0.5, + g: 0.5, + b: 0.5, + a: 1.0, + } + } else { + Color { + r: 0.7, + g: 0.7, + b: 0.7, + a: 1.0, + } + }), + border_radius: 5, + }; + + let input = Primitive::Quad { + bounds: Rectangle { + x: bounds.x + 1.0, + y: bounds.y + 1.0, + width: bounds.width - 2.0, + height: bounds.height - 2.0, + }, + background: Background::Color(Color::WHITE), + border_radius: 5, + }; + + let value = Primitive::Clip { + bounds: text_bounds, + offset: 0, + content: Box::new(Primitive::Text { + content: if text_input.value.is_empty() { + text_input.placeholder.clone() + } else { + text_input.value.clone() + }, + color: if text_input.value.is_empty() { + Color { + r: 0.7, + g: 0.7, + b: 0.7, + a: 1.0, + } + } else { + Color { + r: 0.9, + g: 0.9, + b: 0.9, + a: 1.0, + } + }, + bounds: Rectangle { + width: f32::INFINITY, + ..text_bounds + }, + size: f32::from(text_input.size.unwrap_or(self.default_size())), + horizontal_alignment: HorizontalAlignment::Left, + vertical_alignment: VerticalAlignment::Center, + }), + }; + + ( + Primitive::Group { + primitives: vec![border, input, value], + }, + if is_mouse_over { + MouseCursor::Text + } else { + MouseCursor::OutOfBounds + }, + ) + } +} -- cgit From fedcab6f4f5ffd3a6dfffe7dd41c58df2e314099 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 30 Oct 2019 05:00:12 +0100 Subject: Handle some `TextInput` events --- wgpu/src/renderer/checkbox.rs | 1 + wgpu/src/renderer/scrollable.rs | 2 +- wgpu/src/renderer/text.rs | 2 +- wgpu/src/renderer/text_input.rs | 38 ++++++++++++++++++++------------------ 4 files changed, 23 insertions(+), 20 deletions(-) (limited to 'wgpu') diff --git a/wgpu/src/renderer/checkbox.rs b/wgpu/src/renderer/checkbox.rs index fd3f08b1..ea7a4c0b 100644 --- a/wgpu/src/renderer/checkbox.rs +++ b/wgpu/src/renderer/checkbox.rs @@ -10,6 +10,7 @@ const SIZE: f32 = 28.0; impl checkbox::Renderer for Renderer { fn node(&self, checkbox: &Checkbox) -> Node { Row::<(), Self>::new() + .width(Length::Fill) .spacing(15) .align_items(Align::Center) .push( diff --git a/wgpu/src/renderer/scrollable.rs b/wgpu/src/renderer/scrollable.rs index e9dfc760..f1d87857 100644 --- a/wgpu/src/renderer/scrollable.rs +++ b/wgpu/src/renderer/scrollable.rs @@ -5,7 +5,7 @@ use iced_native::{ }; const SCROLLBAR_WIDTH: u16 = 10; -const SCROLLBAR_MARGIN: u16 = 10; +const SCROLLBAR_MARGIN: u16 = 5; fn scrollbar_bounds(bounds: Rectangle) -> Rectangle { Rectangle { diff --git a/wgpu/src/renderer/text.rs b/wgpu/src/renderer/text.rs index 8fbade4e..606ebe9f 100644 --- a/wgpu/src/renderer/text.rs +++ b/wgpu/src/renderer/text.rs @@ -47,7 +47,7 @@ impl text::Renderer for Renderer { let (width, height) = if let Some(bounds) = glyph_brush.borrow_mut().glyph_bounds(&text) { - (bounds.width(), bounds.height()) + (bounds.width().round(), bounds.height().round()) } else { (0.0, 0.0) }; diff --git a/wgpu/src/renderer/text_input.rs b/wgpu/src/renderer/text_input.rs index bcb55d50..f7a93465 100644 --- a/wgpu/src/renderer/text_input.rs +++ b/wgpu/src/renderer/text_input.rs @@ -23,21 +23,23 @@ impl text_input::Renderer for Renderer { let border = Primitive::Quad { bounds, - background: Background::Color(if is_mouse_over { - Color { - r: 0.5, - g: 0.5, - b: 0.5, - a: 1.0, - } - } else { - Color { - r: 0.7, - g: 0.7, - b: 0.7, - a: 1.0, - } - }), + background: Background::Color( + if is_mouse_over || text_input.state.is_focused { + Color { + r: 0.5, + g: 0.5, + b: 0.5, + a: 1.0, + } + } else { + Color { + r: 0.7, + g: 0.7, + b: 0.7, + a: 1.0, + } + }, + ), border_radius: 5, }; @@ -70,9 +72,9 @@ impl text_input::Renderer for Renderer { } } else { Color { - r: 0.9, - g: 0.9, - b: 0.9, + r: 0.3, + g: 0.3, + b: 0.3, a: 1.0, } }, -- cgit From 43f348dc4abc44baa3794ffd12cf080396aa958d Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Wed, 30 Oct 2019 05:20:41 +0100 Subject: Show text cursor in `TextInput` --- wgpu/src/renderer/text_input.rs | 42 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) (limited to 'wgpu') diff --git a/wgpu/src/renderer/text_input.rs b/wgpu/src/renderer/text_input.rs index f7a93465..30e06878 100644 --- a/wgpu/src/renderer/text_input.rs +++ b/wgpu/src/renderer/text_input.rs @@ -54,6 +54,8 @@ impl text_input::Renderer for Renderer { border_radius: 5, }; + let size = f32::from(text_input.size.unwrap_or(self.default_size())); + let value = Primitive::Clip { bounds: text_bounds, offset: 0, @@ -82,7 +84,7 @@ impl text_input::Renderer for Renderer { width: f32::INFINITY, ..text_bounds }, - size: f32::from(text_input.size.unwrap_or(self.default_size())), + size, horizontal_alignment: HorizontalAlignment::Left, vertical_alignment: VerticalAlignment::Center, }), @@ -90,7 +92,43 @@ impl text_input::Renderer for Renderer { ( Primitive::Group { - primitives: vec![border, input, value], + primitives: if text_input.state.is_focused { + use wgpu_glyph::{GlyphCruncher, Scale, Section}; + + let mut text_value_width = self + .glyph_brush + .borrow_mut() + .glyph_bounds(Section { + text: &text_input.value, + 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_input.value.len() + - text_input.value.trim_end().len(); + + if spaces_at_the_end > 0 { + text_value_width += spaces_at_the_end as f32 * 5.0; + } + + 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] + }, }, if is_mouse_over { MouseCursor::Text -- cgit From 51a0e99097f9ecb63eeb7f2ea7c38089977eb4d0 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 31 Oct 2019 03:50:40 +0100 Subject: Implement cursor movement in `TextInput` --- wgpu/src/renderer/text_input.rs | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'wgpu') diff --git a/wgpu/src/renderer/text_input.rs b/wgpu/src/renderer/text_input.rs index 30e06878..f119ae6a 100644 --- a/wgpu/src/renderer/text_input.rs +++ b/wgpu/src/renderer/text_input.rs @@ -55,17 +55,18 @@ 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 { bounds: text_bounds, offset: 0, content: Box::new(Primitive::Text { - content: if text_input.value.is_empty() { + content: if text.is_empty() { text_input.placeholder.clone() } else { - text_input.value.clone() + text.clone() }, - color: if text_input.value.is_empty() { + color: if text.is_empty() { Color { r: 0.7, g: 0.7, @@ -95,11 +96,18 @@ impl text_input::Renderer for Renderer { 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_input.value, + text: text_before_cursor, bounds: (f32::INFINITY, text_bounds.height), scale: Scale { x: size, y: size }, ..Default::default() @@ -107,11 +115,24 @@ impl text_input::Renderer for Renderer { .map(|bounds| bounds.width().round()) .unwrap_or(0.0); - let spaces_at_the_end = text_input.value.len() - - text_input.value.trim_end().len(); + let spaces_at_the_end = text_before_cursor.len() + - text_before_cursor.trim_end().len(); if spaces_at_the_end > 0 { - text_value_width += spaces_at_the_end as f32 * 5.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 { -- cgit From d3cdee1d9bcd9f7fe22eeccce93ab5a26faf18e8 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 31 Oct 2019 04:43:29 +0100 Subject: Render `TextInput` cursor inside the clipping area --- wgpu/src/renderer/text_input.rs | 173 ++++++++++++++++++++-------------------- 1 file changed, 87 insertions(+), 86 deletions(-) (limited to 'wgpu') 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 -- cgit From 8a0a31c513e02d01e71fdf989709bbfc6bb4579a Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 2 Nov 2019 01:14:07 +0100 Subject: Fix text measurement (needs further testing) --- wgpu/src/renderer/text.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wgpu') diff --git a/wgpu/src/renderer/text.rs b/wgpu/src/renderer/text.rs index 606ebe9f..82f75f09 100644 --- a/wgpu/src/renderer/text.rs +++ b/wgpu/src/renderer/text.rs @@ -47,7 +47,7 @@ impl text::Renderer for Renderer { let (width, height) = if let Some(bounds) = glyph_brush.borrow_mut().glyph_bounds(&text) { - (bounds.width().round(), bounds.height().round()) + (bounds.width().ceil(), bounds.height().ceil()) } else { (0.0, 0.0) }; -- cgit From 470266f54069a1c9b6147026d018b437b6457f7b Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 5 Nov 2019 03:16:46 +0100 Subject: Add horizontal offset to `Primitive::Clip` --- wgpu/src/primitive.rs | 4 ++-- wgpu/src/renderer.rs | 28 +++++++++++++++++----------- wgpu/src/renderer/scrollable.rs | 4 ++-- wgpu/src/renderer/text_input.rs | 4 ++-- 4 files changed, 23 insertions(+), 17 deletions(-) (limited to 'wgpu') diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs index 354b0851..8e40e3a6 100644 --- a/wgpu/src/primitive.rs +++ b/wgpu/src/primitive.rs @@ -1,4 +1,4 @@ -use iced_native::{text, Background, Color, Rectangle}; +use iced_native::{text, Background, Color, Rectangle, Vector}; #[derive(Debug, Clone)] pub enum Primitive { @@ -25,7 +25,7 @@ pub enum Primitive { }, Clip { bounds: Rectangle, - offset: u32, + offset: Vector, content: Box, }, } diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs index fbc39327..ca4cbb58 100644 --- a/wgpu/src/renderer.rs +++ b/wgpu/src/renderer.rs @@ -1,7 +1,7 @@ use crate::{quad, Image, Primitive, Quad, Transformation}; use iced_native::{ renderer::Debugger, renderer::Windowed, Background, Color, Layout, - MouseCursor, Point, Rectangle, Widget, + MouseCursor, Point, Rectangle, Vector, Widget, }; use raw_window_handle::HasRawWindowHandle; @@ -44,17 +44,17 @@ pub struct Target { pub struct Layer<'a> { bounds: Rectangle, - y_offset: u32, + offset: Vector, quads: Vec, images: Vec, text: Vec>, } impl<'a> Layer<'a> { - pub fn new(bounds: Rectangle, y_offset: u32) -> Self { + pub fn new(bounds: Rectangle, offset: Vector) -> Self { Self { bounds, - y_offset, + offset, quads: Vec::new(), images: Vec::new(), text: Vec::new(), @@ -157,7 +157,7 @@ impl Renderer { width: u32::from(target.width), height: u32::from(target.height), }, - 0, + Vector::new(0, 0), )); self.draw_primitive(primitive, &mut layers); @@ -257,7 +257,10 @@ impl Renderer { border_radius, } => { layer.quads.push(Quad { - position: [bounds.x, bounds.y - layer.y_offset as f32], + position: [ + bounds.x - layer.offset.x as f32, + bounds.y - layer.offset.y as f32, + ], scale: [bounds.width, bounds.height], color: match background { Background::Color(color) => color.into_linear(), @@ -279,15 +282,15 @@ impl Renderer { } => { let clip_layer = Layer::new( Rectangle { - x: bounds.x as u32, - y: bounds.y as u32 - layer.y_offset, + x: bounds.x as u32 - layer.offset.x, + y: bounds.y as u32 - layer.offset.y, width: bounds.width as u32, height: bounds.height as u32, }, - layer.y_offset + offset, + layer.offset + *offset, ); - let new_layer = Layer::new(layer.bounds, layer.y_offset); + let new_layer = Layer::new(layer.bounds, layer.offset); layers.push(clip_layer); @@ -307,7 +310,10 @@ impl Renderer { target: &wgpu::TextureView, ) { let translated = transformation - * Transformation::translate(0.0, -(layer.y_offset as f32)); + * Transformation::translate( + -(layer.offset.x as f32), + -(layer.offset.y as f32), + ); if layer.quads.len() > 0 { self.quad_pipeline.draw( diff --git a/wgpu/src/renderer/scrollable.rs b/wgpu/src/renderer/scrollable.rs index 72d77cc8..360759a5 100644 --- a/wgpu/src/renderer/scrollable.rs +++ b/wgpu/src/renderer/scrollable.rs @@ -1,7 +1,7 @@ use crate::{Primitive, Renderer}; use iced_native::{ scrollable, Background, Color, Layout, MouseCursor, Point, Rectangle, - Scrollable, Widget, + Scrollable, Vector, Widget, }; const SCROLLBAR_WIDTH: u16 = 10; @@ -58,7 +58,7 @@ impl scrollable::Renderer for Renderer { let clip = Primitive::Clip { bounds, - offset, + offset: Vector::new(0, offset), content: Box::new(content), }; diff --git a/wgpu/src/renderer/text_input.rs b/wgpu/src/renderer/text_input.rs index deb8eae7..95ea964e 100644 --- a/wgpu/src/renderer/text_input.rs +++ b/wgpu/src/renderer/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, + Color, MouseCursor, Point, Rectangle, TextInput, Vector, }; use std::f32; @@ -89,7 +89,7 @@ impl text_input::Renderer for Renderer { let content = Primitive::Clip { bounds: text_bounds, - offset: 0, + offset: Vector::new(0, 0), content: Box::new(if text_input.state.is_focused { use wgpu_glyph::{GlyphCruncher, Scale, Section}; -- cgit From a2161586dab6837d8c641b6f93ad476f861d8580 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Tue, 5 Nov 2019 03:33:24 +0100 Subject: Implement state-less scrolling in `TextInput` --- wgpu/src/renderer/text_input.rs | 121 +++++++++++++++++++++------------------- 1 file changed, 65 insertions(+), 56 deletions(-) (limited to 'wgpu') diff --git a/wgpu/src/renderer/text_input.rs b/wgpu/src/renderer/text_input.rs index 95ea964e..cff8bf23 100644 --- a/wgpu/src/renderer/text_input.rs +++ b/wgpu/src/renderer/text_input.rs @@ -87,70 +87,79 @@ impl text_input::Renderer for Renderer { vertical_alignment: VerticalAlignment::Center, }; - let content = Primitive::Clip { - bounds: text_bounds, - offset: Vector::new(0, 0), - 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, + let (contents_primitive, offset) = 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 - }), + }, + Vector::new( + ((text_value_width + 5.0) - text_bounds.width).max(0.0) + as u32, + 0, + ), + ) + } else { + (value, Vector::new(0, 0)) + }; + + let contents = Primitive::Clip { + bounds: text_bounds, + offset, + content: Box::new(contents_primitive), }; ( Primitive::Group { - primitives: vec![border, input, content], + primitives: vec![border, input, contents], }, if is_mouse_over { MouseCursor::Text -- cgit