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! --- native/src/widget/text_input.rs | 84 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 native/src/widget/text_input.rs (limited to 'native/src/widget/text_input.rs') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs new file mode 100644 index 00000000..0cb949d1 --- /dev/null +++ b/native/src/widget/text_input.rs @@ -0,0 +1,84 @@ +use crate::{ + Element, Event, Hasher, Layout, Length, Node, Point, Rectangle, Style, + Widget, +}; + +pub use iced_core::{text_input::State, TextInput}; + +impl<'a, Message, Renderer> Widget for TextInput<'a, Message> +where + Renderer: self::Renderer, + Message: Clone + std::fmt::Debug, +{ + fn node(&self, renderer: &Renderer) -> Node { + let text_bounds = + Node::new(Style::default().width(Length::Fill).height( + Length::Units(self.size.unwrap_or(renderer.default_size())), + )); + + Node::with_children( + Style::default() + .width(self.width) + .max_width(self.width) + .padding(self.padding), + vec![text_bounds], + ) + } + + fn on_event( + &mut self, + _event: Event, + _layout: Layout<'_>, + _cursor_position: Point, + _messages: &mut Vec, + _renderer: &Renderer, + ) { + } + + fn draw( + &self, + renderer: &mut Renderer, + layout: Layout<'_>, + cursor_position: Point, + ) -> Renderer::Output { + let bounds = layout.bounds(); + let text_bounds = layout.children().next().unwrap().bounds(); + + renderer.draw(&self, bounds, text_bounds, cursor_position) + } + + fn hash_layout(&self, state: &mut Hasher) { + use std::any::TypeId; + use std::hash::Hash; + + TypeId::of::>().hash(state); + + self.width.hash(state); + self.max_width.hash(state); + self.padding.hash(state); + self.size.hash(state); + } +} + +pub trait Renderer: crate::Renderer + Sized { + fn default_size(&self) -> u16; + + fn draw( + &mut self, + text_input: &TextInput<'_, Message>, + bounds: Rectangle, + text_bounds: Rectangle, + cursor_position: Point, + ) -> Self::Output; +} + +impl<'a, Message, Renderer> From> + for Element<'a, Message, Renderer> +where + Renderer: 'static + self::Renderer, + Message: 'static + Clone + std::fmt::Debug, +{ + fn from(button: TextInput<'a, Message>) -> Element<'a, Message, Renderer> { + Element::new(button) + } +} -- 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 --- native/src/widget/text_input.rs | 50 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 6 deletions(-) (limited to 'native/src/widget/text_input.rs') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 0cb949d1..976ca995 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -1,4 +1,5 @@ use crate::{ + input::{keyboard, mouse, ButtonState}, Element, Event, Hasher, Layout, Length, Node, Point, Rectangle, Style, Widget, }; @@ -27,12 +28,47 @@ where fn on_event( &mut self, - _event: Event, - _layout: Layout<'_>, - _cursor_position: Point, - _messages: &mut Vec, + event: Event, + layout: Layout<'_>, + cursor_position: Point, + messages: &mut Vec, _renderer: &Renderer, ) { + match event { + Event::Mouse(mouse::Event::Input { + button: mouse::Button::Left, + state: ButtonState::Pressed, + }) => { + self.state.is_focused = + layout.bounds().contains(cursor_position); + } + Event::Keyboard(keyboard::Event::CharacterReceived(c)) + if self.state.is_focused && !c.is_control() => + { + self.value.push(c); + + let message = (self.on_change)(self.value.clone()); + messages.push(message); + } + Event::Keyboard(keyboard::Event::Input { + key_code: keyboard::KeyCode::Backspace, + state: ButtonState::Pressed, + }) => { + let _ = self.value.pop(); + + let message = (self.on_change)(self.value.clone()); + messages.push(message); + } + Event::Keyboard(keyboard::Event::Input { + key_code: keyboard::KeyCode::Enter, + state: ButtonState::Pressed, + }) => { + if let Some(on_submit) = self.on_submit.clone() { + messages.push(on_submit); + } + } + _ => {} + } } fn draw( @@ -78,7 +114,9 @@ where Renderer: 'static + self::Renderer, Message: 'static + Clone + std::fmt::Debug, { - fn from(button: TextInput<'a, Message>) -> Element<'a, Message, Renderer> { - Element::new(button) + fn from( + text_input: TextInput<'a, Message>, + ) -> Element<'a, Message, Renderer> { + Element::new(text_input) } } -- 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` --- native/src/widget/text_input.rs | 57 ++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 15 deletions(-) (limited to 'native/src/widget/text_input.rs') diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 976ca995..d9837b61 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -45,28 +45,55 @@ where Event::Keyboard(keyboard::Event::CharacterReceived(c)) if self.state.is_focused && !c.is_control() => { - self.value.push(c); + let cursor_position = self.state.cursor_position(&self.value); - let message = (self.on_change)(self.value.clone()); - messages.push(message); - } - Event::Keyboard(keyboard::Event::Input { - key_code: keyboard::KeyCode::Backspace, - state: ButtonState::Pressed, - }) => { - let _ = self.value.pop(); + self.value.insert(cursor_position, c); + self.state.move_cursor_right(&self.value); - let message = (self.on_change)(self.value.clone()); + let message = (self.on_change)(self.value.to_string()); messages.push(message); } Event::Keyboard(keyboard::Event::Input { - key_code: keyboard::KeyCode::Enter, + key_code, state: ButtonState::Pressed, - }) => { - if let Some(on_submit) = self.on_submit.clone() { - messages.push(on_submit); + }) if self.state.is_focused => match key_code { + keyboard::KeyCode::Enter => { + if let Some(on_submit) = self.on_submit.clone() { + messages.push(on_submit); + } } - } + keyboard::KeyCode::Backspace => { + let cursor_position = + self.state.cursor_position(&self.value); + + if cursor_position > 0 { + self.state.move_cursor_left(&self.value); + + let _ = self.value.remove(cursor_position - 1); + + let message = (self.on_change)(self.value.to_string()); + messages.push(message); + } + } + keyboard::KeyCode::Delete => { + let cursor_position = + self.state.cursor_position(&self.value); + + if cursor_position < self.value.len() { + let _ = self.value.remove(cursor_position); + + let message = (self.on_change)(self.value.to_string()); + messages.push(message); + } + } + keyboard::KeyCode::Left => { + self.state.move_cursor_left(&self.value); + } + keyboard::KeyCode::Right => { + self.state.move_cursor_right(&self.value); + } + _ => {} + }, _ => {} } } -- cgit