leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(workspace-list): debounce scroll events

Browse source
This commit is contained in:
Ashley Wulber 2024-05-14 21:02:18 -04:00 • committed by Michael Murphy
parent 35a8197670
commit 39623ad704
2 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cosmic-applet-workspaces/src/components/app.rs
View file

@ -112,12 +112,12 @@ impl cosmic::Application for IcedWorkspacesApplet {
}
}
Message::WheelScrolled(delta) => {
let delta = match delta {
ScrollDelta::Lines { x, y } => x + y,
ScrollDelta::Pixels { x, y } => x + y,
} as f64;
let (delta, debounce) = match delta {
ScrollDelta::Lines { x, y } => ((x + y) as f64, false),
ScrollDelta::Pixels { x, y } => ((x + y) as f64, true),
};
if let Some(tx) = self.workspace_tx.as_mut() {
let _ = tx.try_send(WorkspaceEvent::Scroll(delta));
let _ = tx.try_send(WorkspaceEvent::Scroll(delta, debounce));
}
}
Message::WorkspaceOverview => {

38
cosmic-applet-workspaces/src/wayland.rs
View file

@ -17,9 +17,12 @@ use cctk::{
};
use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1;
use futures::{channel::mpsc, executor::block_on, SinkExt};
use std::os::{
fd::{FromRawFd, RawFd},
unix::net::UnixStream,
use std::{
os::{
fd::{FromRawFd, RawFd},
unix::net::UnixStream,
},
time::{Duration, Instant},
};
use wayland_client::backend::ObjectId;
use wayland_client::{
@ -32,7 +35,7 @@ use wayland_client::{Connection, QueueHandle, WEnum};
#[derive(Debug, Clone)]
pub enum WorkspaceEvent {
Activate(ObjectId),
Scroll(f64),
Scroll(f64, bool),
}
pub type WorkspaceList = Vec<(String, Option<zcosmic_workspace_handle_v1::State>, ObjectId)>;
@ -80,6 +83,8 @@ pub fn spawn_workspaces(tx: mpsc::Sender<WorkspaceList>) -> SyncSender<Workspace
running: true,
have_workspaces: false,
scroll: 0.0,
next_scroll: None,
last_scroll: Instant::now(),
};
let loop_handle = event_loop.handle();
loop_handle
@ -100,15 +105,32 @@ pub fn spawn_workspaces(tx: mpsc::Sender<WorkspaceList>) -> SyncSender<Workspace
.commit();
}
}
Event::Msg(WorkspaceEvent::Scroll(v)) => {
// reset scroll if we're scrolling in the opposite direction
if state.scroll * v < 0.0 {
Event::Msg(WorkspaceEvent::Scroll(v, debounce)) => {
let dur = if debounce {
Duration::from_millis(350)
} else {
Duration::from_millis(200)
};
if state.last_scroll.elapsed() > Duration::from_millis(100)
|| state.scroll * v < 0.0
{
state.next_scroll = None;
state.scroll = 0.0;
}
state.last_scroll = Instant::now();
state.scroll += v;
if let Some(next) = state.next_scroll {
if next > Instant::now() {
return;
}
state.next_scroll = None;
}
if state.scroll.abs() < 1.0 {
return;
}
state.next_scroll = Some(Instant::now() + dur);
if let Some((w_g, w_i)) = state
.workspace_state
.workspace_groups()
@ -190,6 +212,8 @@ pub struct State {
workspace_state: WorkspaceState,
have_workspaces: bool,
scroll: f64,
next_scroll: Option<Instant>,
last_scroll: Instant,
}
impl State {