TODO Use libcosmic DiscreteScrollHelper

Author: ids1024

Cargo.lock

@@ -59,3 +59,7 @@ opt-level = 1
 [patch."https://github.com/pop-os/cosmic-protocols"]
 cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols//", branch = "main" }
 cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//", branch = "main" }
+
+[patch."https://github.com/pop-os/libcosmic"]
+libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "discrete-scroll" }
+iced_futures = { git = "https://github.com/pop-os/libcosmic//", branch = "discrete-scroll" }

Cargo.toml

@@ -28,6 +28,7 @@ use cosmic::{
     iced_winit::platform_specific::wayland::commands::layer_surface::{
         destroy_layer_surface, get_layer_surface,
     },
+    scroll::DiscreteScrollState,
 };
 use cosmic_comp_config::CosmicCompConfig;
 use cosmic_config::{CosmicConfigEntry, cosmic_config_derive::CosmicConfigEntry};
@@ -85,11 +86,6 @@ impl CosmicFlags for Args {
     }
 }
 
-enum ScrollDirection {
-    Next,
-    Prev,
-}
-
 #[derive(Clone, Debug)]
 enum Msg {
     WaylandEvent(WaylandEvent),
@@ -197,7 +193,7 @@ struct App {
     conf: Conf,
     core: cosmic::app::Core,
     drop_target: Option<DropTarget>,
-    scroll: Option<(f32, Instant)>,
+    scroll: DiscreteScrollState,
     dbus_interface: Option<dbus::Interface>,
 }
 
@@ -620,81 +616,20 @@ impl Application for App {
                 }
             }
             Msg::OnScroll(output, delta) => {
-                // Accumulate delta with a timer
-                // TODO: Should x scroll be handled too?
-                // Best time/pixel count?
-
-                let previous_scroll = if let Some((scroll, last_scroll_time)) = self.scroll {
-                    if last_scroll_time.elapsed() > Duration::from_millis(100) {
-                        0.
-                    } else {
-                        scroll
-                    }
-                } else {
-                    0.
-                };
-
-                let direction = match delta {
-                    ScrollDelta::Pixels { x: _, mut y } => {
-                        y = -y;
-
-                        let scroll = previous_scroll + y;
-                        if scroll <= -SCROLL_PIXELS {
-                            self.scroll = None;
-                            ScrollDirection::Prev
-                        } else if scroll >= SCROLL_PIXELS {
-                            self.scroll = None;
-                            ScrollDirection::Next
-                        } else {
-                            // If scroll has y element, accumulate scroll
-                            self.scroll = if y != 0. {
-                                Some((scroll, Instant::now()))
-                            } else {
-                                None
-                            };
-                            return Task::none();
-                        }
+                let discrete_delta = self.scroll.update(delta);
+                if discrete_delta.y != 0 {
+                    // TODO assumes only one active workspace per output
+                    let workspaces = self.workspaces.for_output(&output).collect::<Vec<_>>();
+                    if let Some(workspace_idx) = workspaces.iter().position(|i| i.is_active()) {
+                        // Add delta_num, to index wrapping around
+                        let new_workspace_idx = (workspace_idx as isize - discrete_delta.y)
+                            .rem_euclid(workspaces.len() as isize)
+                            as usize;
+                        let workspace = workspaces[new_workspace_idx];
+                        self.send_wayland_cmd(backend::Cmd::ActivateWorkspace(
+                            workspace.handle().clone(),
+                        ));
                     }
-                    ScrollDelta::Lines { x: _, mut y } => {
-                        y = -y;
-
-                        let scroll = previous_scroll + y;
-                        if scroll <= -1. {
-                            self.scroll = None;
-                            ScrollDirection::Prev
-                        } else if scroll >= 1. {
-                            self.scroll = None;
-                            ScrollDirection::Next
-                        } else {
-                            self.scroll = if y != 0. {
-                                Some((scroll, Instant::now()))
-                            } else {
-                                None
-                            };
-                            return Task::none();
-                        }
-                    }
-                };
-
-                // TODO assumes only one active workspace per output
-                let workspaces = self.workspaces.for_output(&output).collect::<Vec<_>>();
-                if let Some(workspace_idx) = workspaces.iter().position(|i| i.is_active()) {
-                    let new_workspace_idx = match direction {
-                        // Next workspace on output, wrapping to start
-                        ScrollDirection::Next => (workspace_idx + 1) % workspaces.len(),
-                        // Previous workspace on output, wrapping to end
-                        ScrollDirection::Prev => {
-                            if workspace_idx == 0 {
-                                workspaces.len() - 1
-                            } else {
-                                workspace_idx - 1
-                            }
-                        }
-                    };
-                    let workspace = workspaces[new_workspace_idx];
-                    self.send_wayland_cmd(backend::Cmd::ActivateWorkspace(
-                        workspace.handle().clone(),
-                    ));
                 }
             }
             Msg::DndWorkspaceDrag => {}