Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding helpers and placeholder for typed_input #273

Merged
merged 1 commit into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/typed_input/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ impl TypedInputDemo {

fn view(&self) -> Element<Message> {
let lb_minute = Text::new("Typed Input:");
let txt_minute = typed_input::TypedInput::new(&self.value, Message::TypedInpChanged);
let txt_minute =
typed_input::TypedInput::new("Placeholder", &self.value, Message::TypedInpChanged);

Container::new(
Row::new()
Expand Down
4 changes: 4 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ mod platform {
#[cfg(feature = "number_input")]
pub use {crate::widgets::number_input, number_input::NumberInput};

#[doc(no_inline)]
#[cfg(feature = "typed_input")]
pub use {crate::widgets::typed_input, typed_input::TypedInput};

#[doc(no_inline)]
#[cfg(feature = "selection_list")]
pub use {crate::widgets::selection_list, selection_list::SelectionList};
Expand Down
4 changes: 4 additions & 0 deletions src/widgets.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ pub type NumberInput<'a, T, Message, Theme, Renderer> =

#[cfg(feature = "typed_input")]
pub mod typed_input;
#[cfg(feature = "typed_input")]
/// A field that can only be filled with a specific type.
pub type TypedInput<'a, T, Message, Theme, Renderer> =
typed_input::TypedInput<'a, T, Message, Theme, Renderer>;

#[cfg(feature = "card")]
pub mod card;
Expand Down
19 changes: 19 additions & 0 deletions src/widgets/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,25 @@ where
crate::NumberInput::new(value, bounds, on_changed)
}

#[cfg(feature = "typed_input")]
/// Shortcut helper to create a [`TypedInput`] Widget.
///
/// [`TypedInput`]: crate::TypedInput
#[must_use]
pub fn typed_input<'a, T, Message, Theme, Renderer, F>(
value: &T,
on_changed: F,
) -> crate::TypedInput<'a, T, Message, Theme, Renderer>
where
Message: Clone,
Renderer: iced::advanced::text::Renderer<Font = iced::Font>,
Theme: iced::widget::text_input::Catalog,
F: 'static + Fn(T) -> Message + Copy,
T: 'static + std::fmt::Display + std::str::FromStr + Clone,
{
crate::TypedInput::new("", value, on_changed)
}

#[cfg(feature = "selection_list")]
/// Shortcut helper to create a [`SelectionList`] Widget.
///
Expand Down
6 changes: 3 additions & 3 deletions src/widgets/number_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ where
max: Self::set_max(bounds.end_bound()),
padding,
size: None,
content: TypedInput::new(&value, on_changed)
content: TypedInput::new("", &value, on_changed)
.padding(padding)
.width(Length::Fixed(127.0))
.class(Theme::default_input()),
Expand Down Expand Up @@ -640,7 +640,7 @@ where
.bounds();
let dec_bounds = mod_children
.next()
.expect("fail to get decreate mod layout")
.expect("fail to get decrease mod layout")
.bounds();
let is_mouse_over = bounds.contains(cursor.position().unwrap_or_default());
let is_decrease_disabled = self.value <= self.min || self.min == self.max;
Expand Down Expand Up @@ -682,7 +682,7 @@ where
.bounds();
let dec_bounds = mod_children
.next()
.expect("fail to get decreate mod layout")
.expect("fail to get decrease mod layout")
.bounds();
self.content.draw(
&state.children[0],
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/sidebar/column.rs
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ where
&self.children,
&mut tree.children,
);
let mut container_x = std::f32::MAX;
let mut container_x = f32::MAX;
let mut container_width = 0.0f32;
for row in node.children() {
if row.size().width > container_width {
Expand Down
2 changes: 1 addition & 1 deletion src/widgets/sidebar/row.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ where
&self.children,
&mut tree.children,
);
let mut container_y = std::f32::MAX;
let mut container_y = f32::MAX;
let mut container_height = 0.0f32;
for column in node.children() {
if column.size().height > container_height {
Expand Down
5 changes: 2 additions & 3 deletions src/widgets/typed_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ const DEFAULT_PADDING: f32 = 5.0;
/// }
///
/// let value = 12;
/// let max = 1275;
///
/// let input = TypedInput::new(
/// value,
Expand Down Expand Up @@ -76,7 +75,7 @@ where
/// It expects:
/// - the current value
/// - a function that produces a message when the [`TypedInput`] changes
pub fn new<F>(value: &T, on_changed: F) -> Self
pub fn new<F>(placeholder: &str, value: &T, on_changed: F) -> Self
where
F: 'static + Fn(T) -> Message + Copy,
T: 'a + Clone,
Expand All @@ -85,7 +84,7 @@ where

Self {
value: value.clone(),
text_input: text_input::TextInput::new("", format!("{value}").as_str())
text_input: text_input::TextInput::new(placeholder, format!("{value}").as_str())
.on_input(InternalMessage::OnChange)
.on_submit(InternalMessage::OnSubmit)
.padding(padding)
Expand Down