diff options
| author |  Héctor Ramón <hector0193@gmail.com> | 2022-03-29 18:41:02 +0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-03-29 18:41:02 +0700 |
| commit | 13a2997debef25570e8c14a52456aec1e7425ec6 (patch) | |
| tree | 7c9a921a8a3618f27a36981442e5ad7f19b511d3 /native | |
| parent | f6700000a28066c9cb284c68b3d93a3eef41b4f6 (diff) | |
| parent | d9d6dff550a917d2b73c7ebf96cab2c1472e3243 (diff) | |
| download | iced-13a2997debef25570e8c14a52456aec1e7425ec6.tar.gz iced-13a2997debef25570e8c14a52456aec1e7425ec6.tar.bz2 iced-13a2997debef25570e8c14a52456aec1e7425ec6.zip | |
Merge pull request #1294 from marienz/pure-overlay
Forward overlay() calls in iced_pure::element::Map
Diffstat (limited to 'native')
| -rw-r--r-- | native/src/overlay/element.rs | 2 | ||||
| -rw-r--r-- | native/src/widget/scrollable.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs index b60881e3..24c0fe01 100644 --- a/native/src/overlay/element.rs +++ b/native/src/overlay/element.rs @@ -41,7 +41,7 @@ where where Message: 'a, Renderer: 'a, - B: 'static, + B: 'a, { Element { position: self.position, diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs index 748fd27d..8958f6da 100644 --- a/native/src/widget/scrollable.rs +++ b/native/src/widget/scrollable.rs @@ -33,7 +33,7 @@ pub struct Scrollable<'a, Message, Renderer> { scrollbar_margin: u16, scroller_width: u16, content: Column<'a, Message, Renderer>, - on_scroll: Option<Box<dyn Fn(f32) -> Message>>, + on_scroll: Option<Box<dyn Fn(f32) -> Message + 'a>>, style_sheet: Box<dyn StyleSheet + 'a>, } @@ -181,7 +181,7 @@ pub fn update<Message>( scrollbar_width: u16, scrollbar_margin: u16, scroller_width: u16, - on_scroll: &Option<Box<dyn Fn(f32) -> Message>>, + on_scroll: &Option<Box<dyn Fn(f32) -> Message + '_>>, update_content: impl FnOnce( Event, Layout<'_>, @@ -597,7 +597,7 @@ fn scrollbar( fn notify_on_scroll<Message>( state: &State, - on_scroll: &Option<Box<dyn Fn(f32) -> Message>>, + on_scroll: &Option<Box<dyn Fn(f32) -> Message + '_>>, bounds: Rectangle, content_bounds: Rectangle, shell: &mut Shell<'_, Message>, |