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