wip: pass bounds and content_bounds parameters in `Operations::Sc…

…rollable::scroll_to` not to depend on `scrollable::State::last_notified`
iced-rs · Jul 9, 2024 · 9499a6b · 9499a6b
1 parent 76bbb8d
commit 9499a6b
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 18 deletions.
diff --git a/core/src/widget/operation.rs b/core/src/widget/operation.rs
@@ -37,6 +37,7 @@ pub trait Operation<T>: Send {
         _state: &mut dyn Scrollable,
         _id: Option<&Id>,
         _bounds: Rectangle,
+        _content_bounds: Rectangle,
         _translation: Vector,
     ) {
     }
@@ -127,9 +128,16 @@ where
                     state: &mut dyn Scrollable,
                     id: Option<&Id>,
                     bounds: Rectangle,
+                    content_bounds: Rectangle,
                     translation: Vector,
                 ) {
-                    self.operation.scrollable(state, id, bounds, translation);
+                    self.operation.scrollable(
+                        state,
+                        id,
+                        bounds,
+                        content_bounds,
+                        translation,
+                    );
                 }
 
                 fn focusable(
@@ -170,9 +178,16 @@ where
             state: &mut dyn Scrollable,
             id: Option<&Id>,
             bounds: Rectangle,
+            content_bounds: Rectangle,
             translation: Vector,
         ) {
-            self.operation.scrollable(state, id, bounds, translation);
+            self.operation.scrollable(
+                state,
+                id,
+                bounds,
+                content_bounds,
+                translation,
+            );
         }
 
         fn text_input(&mut self, state: &mut dyn TextInput, id: Option<&Id>) {

diff --git a/core/src/widget/operation/scrollable.rs b/core/src/widget/operation/scrollable.rs
@@ -8,7 +8,12 @@ pub trait Scrollable {
     fn snap_to(&mut self, offset: RelativeOffset);
 
     /// Scroll the widget to the given [`AbsoluteOffset`] along the horizontal & vertical axis.
-    fn scroll_to(&mut self, offset: AbsoluteOffset);
+    fn scroll_to(
+        &mut self,
+        offset: AbsoluteOffset,
+        bounds: Rectangle,
+        content_bounds: Rectangle,
+    );
 }
 
 /// Produces an [`Operation`] that snaps the widget with the given [`Id`] to
@@ -34,6 +39,7 @@ pub fn snap_to<T>(target: Id, offset: RelativeOffset) -> impl Operation<T> {
             state: &mut dyn Scrollable,
             id: Option<&Id>,
             _bounds: Rectangle,
+            _content_bounds: Rectangle,
             _translation: Vector,
         ) {
             if Some(&self.target) == id {
@@ -67,11 +73,12 @@ pub fn scroll_to<T>(target: Id, offset: AbsoluteOffset) -> impl Operation<T> {
             &mut self,
             state: &mut dyn Scrollable,
             id: Option<&Id>,
-            _bounds: Rectangle,
+            bounds: Rectangle,
+            content_bounds: Rectangle,
             _translation: Vector,
         ) {
             if Some(&self.target) == id {
-                state.scroll_to(self.offset);
+                state.scroll_to(self.offset, bounds, content_bounds);
             }
         }
     }

diff --git a/widget/src/container.rs b/widget/src/container.rs
@@ -473,6 +473,7 @@ pub fn visible_bounds(id: Id) -> Task<Option<Rectangle>> {
             _state: &mut dyn widget::operation::Scrollable,
             _id: Option<&widget::Id>,
             bounds: Rectangle,
+            _content_bounds: Rectangle,
             translation: Vector,
         ) {
             match self.scrollables.last() {

diff --git a/widget/src/scrollable.rs b/widget/src/scrollable.rs
@@ -310,6 +310,7 @@ where
             state,
             self.id.as_ref().map(|id| &id.0),
             bounds,
+            content_bounds,
             translation,
         );
 
@@ -1031,8 +1032,13 @@ impl operation::Scrollable for State {
         State::snap_to(self, offset);
     }
 
-    fn scroll_to(&mut self, offset: AbsoluteOffset) {
-        State::scroll_to(self, offset);
+    fn scroll_to(
+        &mut self,
+        offset: AbsoluteOffset,
+        bounds: Rectangle,
+        content_bounds: Rectangle,
+    ) {
+        State::scroll_to(self, offset, bounds, content_bounds);
     }
 }
 
@@ -1210,17 +1216,16 @@ impl State {
     }
 
     /// Scroll to the provided [`AbsoluteOffset`].
-    pub fn scroll_to(&mut self, offset: AbsoluteOffset) {
-        // TODO: do we have cases where `self.last_notified` is `None`?
-        if let Some(viewport) = self.last_notified {
-            self.offset_x_relative = Offset::Absolute(offset.x.max(0.0))
-                .relative(viewport.bounds.width, viewport.content_bounds.width);
-            self.offset_y_relative = Offset::Absolute(offset.y.max(0.0))
-                .relative(
-                    viewport.bounds.height,
-                    viewport.content_bounds.height,
-                );
-        }
+    pub fn scroll_to(
+        &mut self,
+        offset: AbsoluteOffset,
+        bounds: Rectangle,
+        content_bounds: Rectangle,
+    ) {
+        self.offset_x_relative = Offset::Absolute(offset.x.max(0.0))
+            .relative(bounds.width, content_bounds.width);
+        self.offset_y_relative = Offset::Absolute(offset.y.max(0.0))
+            .relative(bounds.height, content_bounds.height);
     }
 
     /// Returns the scrolling translation of the [`State`], given a [`Direction`],