me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename IconPosition to Side in text_input

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-04-11 05:54:51 +02:00
parent 57265ff211
commit cf9d8e0104
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/tour/src/main.rs
View file

@ -585,7 +585,7 @@ impl<'a> Step {
code_point: '\u{E900}', code_point: '\u{E900}',
size: Some(35.0), size: Some(35.0),
spacing: 10.0, spacing: 10.0,
position: text_input::IconPosition::Right, side: text_input::Side::Right,
}); });
} }

18
native/src/widget/text_input.rs
View file

@ -347,16 +347,16 @@ pub struct Icon<Font> {
pub size: Option<f32>, pub size: Option<f32>,
/// The spacing between the [`Icon`] and the text in a [`TextInput`]. /// The spacing between the [`Icon`] and the text in a [`TextInput`].
pub spacing: f32, pub spacing: f32,
/// The position of the icon. /// The side of a [`TextInput`] where to display the [`Icon`].
pub position: IconPosition, pub side: Side,
} }
/// The position of an [`Icon`]. /// The side of a [`TextInput`].
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub enum IconPosition { pub enum Side {
/// Position the [`Icon`] on the left side of a [`TextInput`]. /// The left side of a [`TextInput`].
Left, Left,
/// Position the [`Icon`] on the right side of a [`TextInput`]. /// The right side of a [`TextInput`].
Right, Right,
} }
@ -448,8 +448,8 @@ where
let mut icon_node = let mut icon_node =
layout::Node::new(Size::new(icon_width, text_bounds.height)); layout::Node::new(Size::new(icon_width, text_bounds.height));
match icon.position { match icon.side {
IconPosition::Left => { Side::Left => {
text_node.move_to(Point::new( text_node.move_to(Point::new(
padding.left + icon_width + icon.spacing, padding.left + icon_width + icon.spacing,
padding.top, padding.top,
@ -457,7 +457,7 @@ where
icon_node.move_to(Point::new(padding.left, padding.top)); icon_node.move_to(Point::new(padding.left, padding.top));
} }
IconPosition::Right => { Side::Right => {
text_node.move_to(Point::new(padding.left, padding.top)); text_node.move_to(Point::new(padding.left, padding.top));
icon_node.move_to(Point::new( icon_node.move_to(Point::new(

2
src/widget.rs
View file

@ -124,7 +124,7 @@ pub mod text_input {
//! Display fields that can be filled with text. //! Display fields that can be filled with text.
pub use iced_native::widget::text_input::{ pub use iced_native::widget::text_input::{
focus, move_cursor_to, move_cursor_to_end, move_cursor_to_front, focus, move_cursor_to, move_cursor_to_end, move_cursor_to_front,
select_all, Appearance, Icon, IconPosition, Id, StyleSheet, select_all, Appearance, Icon, Id, Side, StyleSheet,
}; };
/// A field that can be filled with text. /// A field that can be filled with text.