Use Pixels for Text::size
This commit is contained in:
parent
7b8b01f560
commit
570600ce51
16 changed files with 79 additions and 78 deletions
|
|
@ -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<u16>,
|
||||
size: Option<f32>,
|
||||
on_change: Box<dyn Fn(String) -> Message + 'a>,
|
||||
on_paste: Option<Box<dyn Fn(String) -> Message + 'a>>,
|
||||
on_submit: Option<Message>,
|
||||
|
|
@ -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<Pixels>) -> Self {
|
||||
self.size = Some(size.into().0);
|
||||
self
|
||||
}
|
||||
|
||||
|
|
@ -379,7 +379,7 @@ pub fn layout<Renderer>(
|
|||
limits: &layout::Limits,
|
||||
width: Length,
|
||||
padding: Padding,
|
||||
size: Option<u16>,
|
||||
size: Option<f32>,
|
||||
) -> 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<u16>,
|
||||
size: Option<f32>,
|
||||
font: &Renderer::Font,
|
||||
is_secure: bool,
|
||||
on_change: &dyn Fn(String) -> Message,
|
||||
|
|
@ -811,7 +811,7 @@ pub fn draw<Renderer>(
|
|||
state: &State,
|
||||
value: &Value,
|
||||
placeholder: &str,
|
||||
size: Option<u16>,
|
||||
size: Option<f32>,
|
||||
font: &Renderer::Font,
|
||||
is_secure: bool,
|
||||
style: &<Renderer::Theme as StyleSheet>::Style,
|
||||
|
|
@ -1124,7 +1124,7 @@ fn offset<Renderer>(
|
|||
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: &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: &Renderer,
|
||||
text_bounds: Rectangle,
|
||||
font: Renderer::Font,
|
||||
size: Option<u16>,
|
||||
size: Option<f32>,
|
||||
value: &Value,
|
||||
state: &State,
|
||||
x: f32,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue