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

Remove public fields from Viewport

Browse source 
Let's tackle use cases directly instead!
This commit is contained in:
Héctor Ramón Jiménez 2023-07-12 09:26:13 +02:00
parent d79cedd8da
commit 44460f7b8b
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 3 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

34
widget/src/scrollable.rs
View file

@ -577,15 +577,7 @@ pub fn update<Message>(
content_bounds, content_bounds,
); );
notify_on_scroll( notify_on_scroll(state, on_scroll, bounds, content_bounds, shell);
state,
on_scroll,
bounds,
content_bounds,
horizontal_alignment,
vertical_alignment,
shell,
);
return event::Status::Captured; return event::Status::Captured;
} }
@ -631,8 +623,6 @@ pub fn update<Message>(
on_scroll, on_scroll,
bounds, bounds,
content_bounds, content_bounds,
horizontal_alignment,
vertical_alignment,
shell, shell,
); );
} }
@ -679,8 +669,6 @@ pub fn update<Message>(
on_scroll, on_scroll,
bounds, bounds,
content_bounds, content_bounds,
horizontal_alignment,
vertical_alignment,
shell, shell,
); );
@ -717,8 +705,6 @@ pub fn update<Message>(
on_scroll, on_scroll,
bounds, bounds,
content_bounds, content_bounds,
horizontal_alignment,
vertical_alignment,
shell, shell,
); );
} }
@ -760,8 +746,6 @@ pub fn update<Message>(
on_scroll, on_scroll,
bounds, bounds,
content_bounds, content_bounds,
horizontal_alignment,
vertical_alignment,
shell, shell,
); );
} }
@ -798,8 +782,6 @@ pub fn update<Message>(
on_scroll, on_scroll,
bounds, bounds,
content_bounds, content_bounds,
horizontal_alignment,
vertical_alignment,
shell, shell,
); );
@ -1015,8 +997,6 @@ fn notify_on_scroll<Message>(
on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>, on_scroll: &Option<Box<dyn Fn(Viewport) -> Message + '_>>,
bounds: Rectangle, bounds: Rectangle,
content_bounds: Rectangle, content_bounds: Rectangle,
horizontal_alignment: Alignment,
vertical_alignment: Alignment,
shell: &mut Shell<'_, Message>, shell: &mut Shell<'_, Message>,
) { ) {
if let Some(on_scroll) = on_scroll { if let Some(on_scroll) = on_scroll {
@ -1031,8 +1011,6 @@ fn notify_on_scroll<Message>(
offset_y: state.offset_y, offset_y: state.offset_y,
bounds, bounds,
content_bounds, content_bounds,
horizontal_alignment,
vertical_alignment,
}; };
// Don't publish redundant viewports to shell // Don't publish redundant viewports to shell
@ -1121,14 +1099,8 @@ impl Offset {
pub struct Viewport { pub struct Viewport {
offset_x: Offset, offset_x: Offset,
offset_y: Offset, offset_y: Offset,
/// The viewport bounds of the [`Scrollable`]. bounds: Rectangle,
pub bounds: Rectangle, content_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,
} }
impl Viewport { impl Viewport {