From 7b8b01f560569ae18d9337a31ba94f6c1c2ba0dd Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 4 Feb 2023 12:24:13 +0100 Subject: Use `f32` in `Length::Units` and rename it to `Fixed` --- native/src/widget/text_input.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 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 5bfc918c..d4ab3d8d 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -133,8 +133,8 @@ where self } /// Sets the width of the [`TextInput`]. - pub fn width(mut self, width: Length) -> Self { - self.width = width; + pub fn width(mut self, width: impl Into) -> Self { + self.width = width.into(); self } @@ -387,11 +387,7 @@ where let text_size = size.unwrap_or_else(|| renderer.default_size()); let padding = padding.fit(Size::ZERO, limits.max()); - - let limits = limits - .width(width) - .pad(padding) - .height(Length::Units(text_size)); + let limits = limits.width(width).pad(padding).height(text_size); let mut text = layout::Node::new(limits.resolve(Size::ZERO)); text.move_to(Point::new(padding.left.into(), padding.top.into())); -- cgit From 570600ce513e7e02b23c1da8322c68fbb876d1b0 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Sat, 4 Feb 2023 16:41:18 +0100 Subject: Use `Pixels` for `Text::size` --- native/src/widget/text_input.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 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 d4ab3d8d..02304cae 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -25,7 +25,7 @@ use crate::widget::operation::{self, Operation}; use crate::widget::tree::{self, Tree}; use crate::window; use crate::{ - Clipboard, Color, Command, Element, Layout, Length, Padding, Point, + Clipboard, Color, Command, Element, Layout, Length, Padding, Pixels, Point, Rectangle, Shell, Size, Vector, Widget, }; @@ -64,7 +64,7 @@ where font: Renderer::Font, width: Length, padding: Padding, - size: Option, + size: Option, on_change: Box Message + 'a>, on_paste: Option Message + 'a>>, on_submit: Option, @@ -145,8 +145,8 @@ where } /// Sets the text size of the [`TextInput`]. - pub fn size(mut self, size: u16) -> Self { - self.size = Some(size); + pub fn size(mut self, size: impl Into) -> Self { + self.size = Some(size.into().0); self } @@ -379,7 +379,7 @@ pub fn layout( limits: &layout::Limits, width: Length, padding: Padding, - size: Option, + size: Option, ) -> layout::Node where Renderer: text::Renderer, @@ -405,7 +405,7 @@ pub fn update<'a, Message, Renderer>( clipboard: &mut dyn Clipboard, shell: &mut Shell<'_, Message>, value: &mut Value, - size: Option, + size: Option, font: &Renderer::Font, is_secure: bool, on_change: &dyn Fn(String) -> Message, @@ -811,7 +811,7 @@ pub fn draw( state: &State, value: &Value, placeholder: &str, - size: Option, + size: Option, font: &Renderer::Font, is_secure: bool, style: &::Style, @@ -1124,7 +1124,7 @@ fn offset( renderer: &Renderer, text_bounds: Rectangle, font: Renderer::Font, - size: u16, + size: f32, value: &Value, state: &State, ) -> f32 @@ -1158,7 +1158,7 @@ fn measure_cursor_and_scroll_offset( renderer: &Renderer, text_bounds: Rectangle, value: &Value, - size: u16, + size: f32, cursor_index: usize, font: Renderer::Font, ) -> (f32, f32) @@ -1181,7 +1181,7 @@ fn find_cursor_position( renderer: &Renderer, text_bounds: Rectangle, font: Renderer::Font, - size: Option, + size: Option, value: &Value, state: &State, x: f32, -- cgit From 3320ac1126750ed1c462d4f1ff81a59c74d1e9fb Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Fri, 17 Feb 2023 16:09:49 +0100 Subject: Use `f32` for `Padding` --- native/src/widget/text_input.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 02304cae..ee0473ea 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -94,7 +94,7 @@ where is_secure: false, font: Default::default(), width: Length::Fill, - padding: Padding::new(5), + padding: Padding::new(5.0), size: None, on_change: Box::new(on_change), on_paste: None, @@ -390,7 +390,7 @@ where let limits = limits.width(width).pad(padding).height(text_size); let mut text = layout::Node::new(limits.resolve(Size::ZERO)); - text.move_to(Point::new(padding.left.into(), padding.top.into())); + text.move_to(Point::new(padding.left, padding.top)); layout::Node::with_children(text.size().pad(padding), vec![text]) } @@ -965,7 +965,7 @@ pub fn draw( width: f32::INFINITY, ..text_bounds }, - size: f32::from(size), + size, horizontal_alignment: alignment::Horizontal::Left, vertical_alignment: alignment::Vertical::Center, }); @@ -1197,7 +1197,7 @@ where renderer .hit_test( &value.to_string(), - size.into(), + size, font, Size::INFINITY, Point::new(x + offset, text_bounds.height / 2.0), -- cgit