From d91f4f6aa74d0693179a02167d626efa3ac4c20b Mon Sep 17 00:00:00 2001
From: Bingus <shankern@protonmail.com>
Date: Sat, 19 Nov 2022 10:29:37 -0800
Subject: Add multidirectional scrolling capabilities to the existing
 Scrollable.

---
 native/src/widget/operation/scrollable.rs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'native/src/widget/operation')

diff --git a/native/src/widget/operation/scrollable.rs b/native/src/widget/operation/scrollable.rs
index 2210137d..1e8b7543 100644
--- a/native/src/widget/operation/scrollable.rs
+++ b/native/src/widget/operation/scrollable.rs
@@ -1,27 +1,22 @@
 //! Operate on widgets that can be scrolled.
 use crate::widget::{Id, Operation};
+use iced_core::Vector;
 
 /// The internal state of a widget that can be scrolled.
 pub trait Scrollable {
     /// Snaps the scroll of the widget to the given `percentage`.
-    fn snap_to(&mut self, percentage: f32);
+    fn snap_to(&mut self, percentage: Vector<f32>);
 }
 
 /// Produces an [`Operation`] that snaps the widget with the given [`Id`] to
 /// the provided `percentage`.
-pub fn snap_to<T>(target: Id, percentage: f32) -> impl Operation<T> {
+pub fn snap_to<T>(target: Id, percentage: Vector<f32>) -> impl Operation<T> {
     struct SnapTo {
         target: Id,
-        percentage: f32,
+        percentage: Vector<f32>,
     }
 
     impl<T> Operation<T> for SnapTo {
-        fn scrollable(&mut self, state: &mut dyn Scrollable, id: Option<&Id>) {
-            if Some(&self.target) == id {
-                state.snap_to(self.percentage);
-            }
-        }
-
         fn container(
             &mut self,
             _id: Option<&Id>,
@@ -29,6 +24,12 @@ pub fn snap_to<T>(target: Id, percentage: f32) -> impl Operation<T> {
         ) {
             operate_on_children(self)
         }
+
+        fn scrollable(&mut self, state: &mut dyn Scrollable, id: Option<&Id>) {
+            if Some(&self.target) == id {
+                state.snap_to(self.percentage);
+            }
+        }
     }
 
     SnapTo { target, percentage }
-- 
cgit