diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-10-30 03:31:07 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-10-30 03:31:07 +0100 |
| commit | 63cd0fd8eb1eebae8de7d5141c846fc4ea55d702 (patch) | |
| tree | e0a427a35435ad5fe5ce98a0b5050a1026a80207 /wgpu | |
| parent | 85916c9e8710ee90cbf37d384acbb6d208ff1da3 (diff) | |
| download | iced-63cd0fd8eb1eebae8de7d5141c846fc4ea55d702.tar.gz iced-63cd0fd8eb1eebae8de7d5141c846fc4ea55d702.tar.bz2 iced-63cd0fd8eb1eebae8de7d5141c846fc4ea55d702.zip | |
Draft `TextInput` widget structure
Also started a `todos` example to showcase it!
Diffstat (limited to 'wgpu')
| -rw-r--r-- | wgpu/src/renderer.rs | 22 | ||||
| -rw-r--r-- | wgpu/src/renderer/scrollable.rs | 12 | ||||
| -rw-r--r-- | wgpu/src/renderer/text_input.rs | 100 |
3 files changed, 118 insertions, 16 deletions
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<Layer<'a>>, ) { + 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<Message>( + &mut self, + text_input: &TextInput<Message>, + 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 + }, + ) + } +} |