Skip to content

Commit

Permalink
Implement some From traits for text_input::Id
Browse files Browse the repository at this point in the history
  • Loading branch information
hecrj committed Sep 18, 2024
1 parent f897442 commit 1448c5b
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 23 deletions.
8 changes: 7 additions & 1 deletion core/src/window/id.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::fmt;
use std::hash::Hash;

use std::sync::atomic::{self, AtomicU64};

/// The id of the window.
Expand All @@ -14,3 +14,9 @@ impl Id {
Id(COUNT.fetch_add(1, atomic::Ordering::Relaxed))
}
}

impl fmt::Display for Id {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.0.fmt(f)
}
}
6 changes: 2 additions & 4 deletions examples/multi_window/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ struct Window {
scale_input: String,
current_scale: f64,
theme: Theme,
input_id: iced::widget::text_input::Id,
}

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -86,7 +85,7 @@ impl Example {
}
Message::WindowOpened(id) => {
let window = Window::new(self.windows.len() + 1);
let focus_input = text_input::focus(window.input_id.clone());
let focus_input = text_input::focus(format!("input-{id}"));

self.windows.insert(id, window);

Expand Down Expand Up @@ -163,7 +162,6 @@ impl Window {
scale_input: "1.0".to_string(),
current_scale: 1.0,
theme: Theme::ALL[count % Theme::ALL.len()].clone(),
input_id: text_input::Id::unique(),
}
}

Expand All @@ -182,7 +180,7 @@ impl Window {
text("Window title:"),
text_input("Window Title", &self.title)
.on_input(move |msg| { Message::TitleChanged(id, msg) })
.id(self.input_id.clone())
.id(format!("input-{id}"))
];

let new_window_button =
Expand Down
1 change: 0 additions & 1 deletion examples/todos/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ publish = false
iced.workspace = true
iced.features = ["async-std", "debug"]

once_cell.workspace = true
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
uuid = { version = "1.0", features = ["v4", "fast-rng", "serde"] }
Expand Down
7 changes: 2 additions & 5 deletions examples/todos/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ use iced::widget::{
use iced::window;
use iced::{Center, Element, Fill, Font, Subscription, Task as Command};

use once_cell::sync::Lazy;
use serde::{Deserialize, Serialize};
use uuid::Uuid;

static INPUT_ID: Lazy<text_input::Id> = Lazy::new(text_input::Id::unique);

pub fn main() -> iced::Result {
#[cfg(not(target_arch = "wasm32"))]
tracing_subscriber::fmt::init();
Expand Down Expand Up @@ -85,7 +82,7 @@ impl Todos {
_ => {}
}

text_input::focus(INPUT_ID.clone())
text_input::focus("new-task")
}
Todos::Loaded(state) => {
let mut saved = false;
Expand Down Expand Up @@ -198,7 +195,7 @@ impl Todos {
.align_x(Center);

let input = text_input("What needs to be done?", input_value)
.id(INPUT_ID.clone())
.id("new-task")
.on_input(Message::InputChanged)
.on_submit(Message::CreateTask)
.padding(15)
Expand Down
39 changes: 27 additions & 12 deletions widget/src/text_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ where
}

/// Sets the [`Id`] of the [`TextInput`].
pub fn id(mut self, id: Id) -> Self {
self.id = Some(id);
pub fn id(mut self, id: impl Into<Id>) -> Self {
self.id = Some(id.into());
self
}

Expand Down Expand Up @@ -1226,38 +1226,53 @@ impl From<Id> for widget::Id {
}
}

impl From<&'static str> for Id {
fn from(id: &'static str) -> Self {
Self::new(id)
}
}

impl From<String> for Id {
fn from(id: String) -> Self {
Self::new(id)
}
}

/// Produces a [`Task`] that focuses the [`TextInput`] with the given [`Id`].
pub fn focus<T>(id: Id) -> Task<T> {
task::effect(Action::widget(operation::focusable::focus(id.0)))
pub fn focus<T>(id: impl Into<Id>) -> Task<T> {
task::effect(Action::widget(operation::focusable::focus(id.into().0)))
}

/// Produces a [`Task`] that moves the cursor of the [`TextInput`] with the given [`Id`] to the
/// end.
pub fn move_cursor_to_end<T>(id: Id) -> Task<T> {
pub fn move_cursor_to_end<T>(id: impl Into<Id>) -> Task<T> {
task::effect(Action::widget(operation::text_input::move_cursor_to_end(
id.0,
id.into().0,
)))
}

/// Produces a [`Task`] that moves the cursor of the [`TextInput`] with the given [`Id`] to the
/// front.
pub fn move_cursor_to_front<T>(id: Id) -> Task<T> {
pub fn move_cursor_to_front<T>(id: impl Into<Id>) -> Task<T> {
task::effect(Action::widget(operation::text_input::move_cursor_to_front(
id.0,
id.into().0,
)))
}

/// Produces a [`Task`] that moves the cursor of the [`TextInput`] with the given [`Id`] to the
/// provided position.
pub fn move_cursor_to<T>(id: Id, position: usize) -> Task<T> {
pub fn move_cursor_to<T>(id: impl Into<Id>, position: usize) -> Task<T> {
task::effect(Action::widget(operation::text_input::move_cursor_to(
id.0, position,
id.into().0,
position,
)))
}

/// Produces a [`Task`] that selects all the content of the [`TextInput`] with the given [`Id`].
pub fn select_all<T>(id: Id) -> Task<T> {
task::effect(Action::widget(operation::text_input::select_all(id.0)))
pub fn select_all<T>(id: impl Into<Id>) -> Task<T> {
task::effect(Action::widget(operation::text_input::select_all(
id.into().0,
)))
}

/// The state of a [`TextInput`].
Expand Down

0 comments on commit 1448c5b

Please sign in to comment.