diff options
| -rw-r--r-- | widget/src/scrollable.rs | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs index 3912f445..b6111975 100644 --- a/widget/src/scrollable.rs +++ b/widget/src/scrollable.rs @@ -577,15 +577,7 @@ pub fn update<Message>( content_bounds, ); - notify_on_scroll( - state, - on_scroll, - bounds, - content_bounds, - horizontal_alignment, - vertical_alignment, - shell, - ); + notify_on_scroll(state, on_scroll, bounds, content_bounds, shell); return event::Status::Captured; } @@ -631,8 +623,6 @@ pub fn update<Message>( on_scroll, bounds, content_bounds, - horizontal_alignment, - vertical_alignment, shell, ); } @@ -679,8 +669,6 @@ pub fn update<Message>( on_scroll, bounds, content_bounds, - horizontal_alignment, - vertical_alignment, shell, ); @@ -717,8 +705,6 @@ pub fn update<Message>( on_scroll, bounds, content_bounds, - horizontal_alignment, - vertical_alignment, shell, ); } @@ -760,8 +746,6 @@ pub fn update<Message>( on_scroll, bounds, content_bounds, - horizontal_alignment, - vertical_alignment, shell, ); } @@ -798,8 +782,6 @@ pub fn update<Message>( on_scroll, bounds, content_bounds, - horizontal_alignment, - vertical_alignment, shell, ); @@ -1015,8 +997,6 @@ fn notify_on_scroll<Message>( on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>, bounds: Rectangle, content_bounds: Rectangle, - horizontal_alignment: Alignment, - vertical_alignment: Alignment, shell: &mut Shell<'_, Message>, ) { if let Some(on_scroll) = on_scroll { @@ -1031,8 +1011,6 @@ fn notify_on_scroll<Message>( offset_y: state.offset_y, bounds, content_bounds, - horizontal_alignment, - vertical_alignment, }; // Don't publish redundant viewports to shell @@ -1121,14 +1099,8 @@ impl Offset { pub struct Viewport { offset_x: Offset, offset_y: Offset, - /// The viewport bounds of the [`Scrollable`]. - pub bounds: Rectangle, - /// The content bounds of the [`Scrollable`]. - pub content_bounds: Rectangle, - /// The horizontal [`Alignment`] of the [`Scrollable`]. - pub horizontal_alignment: Alignment, - /// The vertical [`Alignment`] of the [`Scrollable`]. - pub vertical_alignment: Alignment, + bounds: Rectangle, + content_bounds: Rectangle, } impl Viewport { |