diff options
Diffstat (limited to 'native/src/widget')
-rw-r--r-- | native/src/widget/button.rs | 2 | ||||
-rw-r--r-- | native/src/widget/column.rs | 6 | ||||
-rw-r--r-- | native/src/widget/pick_list.rs | 10 | ||||
-rw-r--r-- | native/src/widget/progress_bar.rs | 2 | ||||
-rw-r--r-- | native/src/widget/row.rs | 6 | ||||
-rw-r--r-- | native/src/widget/scrollable.rs | 6 | ||||
-rw-r--r-- | native/src/widget/slider.rs | 4 | ||||
-rw-r--r-- | native/src/widget/text_input.rs | 2 |
8 files changed, 25 insertions, 13 deletions
diff --git a/native/src/widget/button.rs b/native/src/widget/button.rs index d4e88424..a33ee7f7 100644 --- a/native/src/widget/button.rs +++ b/native/src/widget/button.rs @@ -382,7 +382,7 @@ where self.on_press.is_some(), theme, self.style, - || &self.state, + || self.state, ); self.content.draw( diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs index 01ddd9f1..4eee7d3c 100644 --- a/native/src/widget/column.rs +++ b/native/src/widget/column.rs @@ -102,6 +102,12 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> { } } +impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer> { + fn default() -> Self { + Self::new() + } +} + impl<'a, Message, Renderer> Widget<Message, Renderer> for Column<'a, Message, Renderer> where diff --git a/native/src/widget/pick_list.rs b/native/src/widget/pick_list.rs index e735151e..61b0eb96 100644 --- a/native/src/widget/pick_list.rs +++ b/native/src/widget/pick_list.rs @@ -525,7 +525,7 @@ where ) -> Option<overlay::Element<'_, Message, Renderer>> { overlay( layout, - &mut self.state, + self.state, self.padding, self.text_size, self.font.clone(), @@ -535,8 +535,8 @@ where } } -impl<'a, T: 'a, Message, Renderer> Into<Element<'a, Message, Renderer>> - for PickList<'a, T, Message, Renderer> +impl<'a, T: 'a, Message, Renderer> From<PickList<'a, T, Message, Renderer>> + for Element<'a, Message, Renderer> where T: Clone + ToString + Eq, [T]: ToOwned<Owned = Vec<T>>, @@ -549,7 +549,7 @@ where <Renderer::Theme as StyleSheet>::Style: Into<<Renderer::Theme as menu::StyleSheet>::Style>, { - fn into(self) -> Element<'a, Message, Renderer> { - Element::new(self) + fn from(pick_list: PickList<'a, T, Message, Renderer>) -> Self { + Element::new(pick_list) } } diff --git a/native/src/widget/progress_bar.rs b/native/src/widget/progress_bar.rs index 4eb7438a..50bdcda6 100644 --- a/native/src/widget/progress_bar.rs +++ b/native/src/widget/progress_bar.rs @@ -76,7 +76,7 @@ where } } -impl<'a, Message, Renderer> Widget<Message, Renderer> for ProgressBar<Renderer> +impl<Message, Renderer> Widget<Message, Renderer> for ProgressBar<Renderer> where Renderer: crate::Renderer, Renderer::Theme: StyleSheet, diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs index 9cff74c6..9d8cc715 100644 --- a/native/src/widget/row.rs +++ b/native/src/widget/row.rs @@ -102,6 +102,12 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> { } } +impl<'a, Message, Renderer> Default for Row<'a, Message, Renderer> { + fn default() -> Self { + Self::new() + } +} + impl<'a, Message, Renderer> Widget<Message, Renderer> for Row<'a, Message, Renderer> where diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs index 5d550315..1b255860 100644 --- a/native/src/widget/scrollable.rs +++ b/native/src/widget/scrollable.rs @@ -662,7 +662,7 @@ where shell: &mut Shell<'_, Message>, ) -> event::Status { update( - &mut self.state, + self.state, event, layout, cursor_position, @@ -693,7 +693,7 @@ where renderer: &Renderer, ) -> mouse::Interaction { mouse_interaction( - &self.state, + self.state, layout, cursor_position, self.scrollbar_width, @@ -720,7 +720,7 @@ where _viewport: &Rectangle, ) { draw( - &self.state, + self.state, renderer, theme, layout, diff --git a/native/src/widget/slider.rs b/native/src/widget/slider.rs index c75c1e99..a5ff611c 100644 --- a/native/src/widget/slider.rs +++ b/native/src/widget/slider.rs @@ -410,7 +410,7 @@ where layout, cursor_position, shell, - &mut self.state, + self.state, &mut self.value, &self.range, self.step, @@ -432,7 +432,7 @@ where renderer, layout, cursor_position, - &self.state, + self.state, self.value, &self.range, theme, diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 835b2b4d..98265ef2 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -176,7 +176,7 @@ where theme, layout, cursor_position, - &self.state, + self.state, value.unwrap_or(&self.value), &self.placeholder, self.size, |