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

Implement State::options for combo_box

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-08-05 23:12:26 +02:00
parent 145c3dc8fc
commit 3a3fda83cd
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
1 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

38
widget/src/combo_box.rs
View file

@ -208,12 +208,14 @@ where
/// The local state of a [`ComboBox`]. /// The local state of a [`ComboBox`].
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct State<T>(RefCell<Inner<T>>); pub struct State<T> {
options: Vec<T>,
inner: RefCell<Inner<T>>,
}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
struct Inner<T> { struct Inner<T> {
value: String, value: String,
options: Vec<T>,
option_matchers: Vec<String>, option_matchers: Vec<String>,
filtered_options: Filtered<T>, filtered_options: Filtered<T>,
} }
@ -247,34 +249,44 @@ where
.collect(), .collect(),
); );
Self(RefCell::new(Inner { Self {
value,
options, options,
option_matchers, inner: RefCell::new(Inner {
filtered_options, value,
})) option_matchers,
filtered_options,
}),
}
}
/// Returns the options of the [`State`].
///
/// These are the options provided when the [`State`]
/// was constructed with [`State::new`].
pub fn options(&self) -> &[T] {
&self.options
} }
fn value(&self) -> String { fn value(&self) -> String {
let inner = self.0.borrow(); let inner = self.inner.borrow();
inner.value.clone() inner.value.clone()
} }
fn with_inner<O>(&self, f: impl FnOnce(&Inner<T>) -> O) -> O { fn with_inner<O>(&self, f: impl FnOnce(&Inner<T>) -> O) -> O {
let inner = self.0.borrow(); let inner = self.inner.borrow();
f(&inner) f(&inner)
} }
fn with_inner_mut(&self, f: impl FnOnce(&mut Inner<T>)) { fn with_inner_mut(&self, f: impl FnOnce(&mut Inner<T>)) {
let mut inner = self.0.borrow_mut(); let mut inner = self.inner.borrow_mut();
f(&mut inner); f(&mut inner);
} }
fn sync_filtered_options(&self, options: &mut Filtered<T>) { fn sync_filtered_options(&self, options: &mut Filtered<T>) {
let inner = self.0.borrow(); let inner = self.inner.borrow();
inner.filtered_options.sync(options); inner.filtered_options.sync(options);
} }
@ -440,7 +452,7 @@ where
state.filtered_options.update( state.filtered_options.update(
search( search(
&state.options, &self.state.options,
&state.option_matchers, &state.option_matchers,
&state.value, &state.value,
) )
@ -589,7 +601,7 @@ where
if let Some(selection) = menu.new_selection.take() { if let Some(selection) = menu.new_selection.take() {
// Clear the value and reset the options and menu // Clear the value and reset the options and menu
state.value = String::new(); state.value = String::new();
state.filtered_options.update(state.options.clone()); state.filtered_options.update(self.state.options.clone());
menu.menu = menu::State::default(); menu.menu = menu::State::default();
// Notify the selection // Notify the selection