diff options
Diffstat (limited to '')
-rw-r--r-- | native/src/widget.rs | 4 | ||||
-rw-r--r-- | native/src/widget/column.rs | 4 | ||||
-rw-r--r-- | native/src/widget/combo_box.rs | 8 | ||||
-rw-r--r-- | native/src/widget/container.rs | 4 | ||||
-rw-r--r-- | native/src/widget/row.rs | 4 | ||||
-rw-r--r-- | native/src/widget/scrollable.rs | 6 |
6 files changed, 15 insertions, 15 deletions
diff --git a/native/src/widget.rs b/native/src/widget.rs index 4bca7722..11952018 100644 --- a/native/src/widget.rs +++ b/native/src/widget.rs @@ -70,7 +70,7 @@ pub use text::Text; #[doc(no_inline)] pub use text_input::TextInput; -use crate::{layout, Clipboard, Event, Hasher, Layout, Length, Overlay, Point}; +use crate::{layout, overlay, Clipboard, Event, Hasher, Layout, Length, Point}; /// A component that displays information and allows interaction. /// @@ -182,7 +182,7 @@ where fn overlay<'b>( &'b mut self, _layout: Layout<'_>, - ) -> Option<Overlay<'b, Message, Renderer>> { + ) -> Option<overlay::Element<'b, Message, Renderer>> { None } } diff --git a/native/src/widget/column.rs b/native/src/widget/column.rs index e83ef93d..83d5054f 100644 --- a/native/src/widget/column.rs +++ b/native/src/widget/column.rs @@ -2,7 +2,7 @@ use std::hash::Hash; use crate::{ - layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Overlay, + layout, overlay, Align, Clipboard, Element, Event, Hasher, Layout, Length, Point, Widget, }; @@ -208,7 +208,7 @@ where fn overlay( &mut self, layout: Layout<'_>, - ) -> Option<Overlay<'_, Message, Renderer>> { + ) -> Option<overlay::Element<'_, Message, Renderer>> { self.children .iter_mut() .zip(layout.children()) diff --git a/native/src/widget/combo_box.rs b/native/src/widget/combo_box.rs index 9447b9dd..e33eebfd 100644 --- a/native/src/widget/combo_box.rs +++ b/native/src/widget/combo_box.rs @@ -1,8 +1,8 @@ use crate::{ - layout, mouse, + layout, mouse, overlay, overlay::menu::{self, Menu}, - scrollable, text, Clipboard, Element, Event, Hasher, Layout, Length, - Overlay, Point, Rectangle, Size, Widget, + scrollable, text, Clipboard, Element, Event, Hasher, Layout, Length, Point, + Rectangle, Size, Widget, }; use std::borrow::Cow; @@ -225,7 +225,7 @@ where fn overlay( &mut self, layout: Layout<'_>, - ) -> Option<Overlay<'_, Message, Renderer>> { + ) -> Option<overlay::Element<'_, Message, Renderer>> { if self.menu.is_open() { let bounds = layout.bounds(); diff --git a/native/src/widget/container.rs b/native/src/widget/container.rs index 4ab10837..0ee67db0 100644 --- a/native/src/widget/container.rs +++ b/native/src/widget/container.rs @@ -2,7 +2,7 @@ use std::hash::Hash; use crate::{ - layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Overlay, + layout, overlay, Align, Clipboard, Element, Event, Hasher, Layout, Length, Point, Rectangle, Widget, }; @@ -218,7 +218,7 @@ where fn overlay( &mut self, layout: Layout<'_>, - ) -> Option<Overlay<'_, Message, Renderer>> { + ) -> Option<overlay::Element<'_, Message, Renderer>> { self.content.overlay(layout.children().next().unwrap()) } } diff --git a/native/src/widget/row.rs b/native/src/widget/row.rs index 1cfe2d66..eda515b0 100644 --- a/native/src/widget/row.rs +++ b/native/src/widget/row.rs @@ -2,7 +2,7 @@ use std::hash::Hash; use crate::{ - layout, Align, Clipboard, Element, Event, Hasher, Layout, Length, Overlay, + layout, overlay, Align, Clipboard, Element, Event, Hasher, Layout, Length, Point, Widget, }; @@ -210,7 +210,7 @@ where fn overlay( &mut self, layout: Layout<'_>, - ) -> Option<Overlay<'_, Message, Renderer>> { + ) -> Option<overlay::Element<'_, Message, Renderer>> { self.children .iter_mut() .zip(layout.children()) diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs index 87871e28..abd8cfbd 100644 --- a/native/src/widget/scrollable.rs +++ b/native/src/widget/scrollable.rs @@ -1,7 +1,7 @@ //! Navigate an endless amount of content with a scrollbar. use crate::{ - column, layout, mouse, Align, Clipboard, Column, Element, Event, Hasher, - Layout, Length, Overlay, Point, Rectangle, Size, Vector, Widget, + column, layout, mouse, overlay, Align, Clipboard, Column, Element, Event, + Hasher, Layout, Length, Point, Rectangle, Size, Vector, Widget, }; use std::{f32, hash::Hash, u32}; @@ -319,7 +319,7 @@ where fn overlay( &mut self, layout: Layout<'_>, - ) -> Option<Overlay<'_, Message, Renderer>> { + ) -> Option<overlay::Element<'_, Message, Renderer>> { let Self { content, state, .. } = self; content |