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

fix: workspaces scrolling

Browse source
This commit is contained in:
Ashley Wulber 2024-01-04 11:24:00 -05:00 • committed by Ashley Wulber
parent c112048739
commit 336141e69d
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,6 +79,7 @@ pub fn spawn_workspaces(tx: mpsc::Sender<WorkspaceList>) -> SyncSender<Workspace
tx, tx,
running: true, running: true,
have_workspaces: false, have_workspaces: false,
scroll: 0.0,
}; };
let loop_handle = event_loop.handle(); let loop_handle = event_loop.handle();
loop_handle loop_handle
@ -100,6 +101,14 @@ pub fn spawn_workspaces(tx: mpsc::Sender<WorkspaceList>) -> SyncSender<Workspace
} }
} }
Event::Msg(WorkspaceEvent::Scroll(v)) => { Event::Msg(WorkspaceEvent::Scroll(v)) => {
// reset scroll if we're scrolling in the opposite direction
if state.scroll * v < 0.0 {
state.scroll = 0.0;
}
state.scroll += v;
if state.scroll.abs() < 1.0 {
return;
}
if let Some((w_g, w_i)) = state if let Some((w_g, w_i)) = state
.workspace_state .workspace_state
.workspace_groups() .workspace_groups()
@ -123,17 +132,18 @@ pub fn spawn_workspaces(tx: mpsc::Sender<WorkspaceList>) -> SyncSender<Workspace
}) })
{ {
let max_w = w_g.workspaces.len().wrapping_sub(1); let max_w = w_g.workspaces.len().wrapping_sub(1);
let d_i = if v > 0.0 { let d_i = if state.scroll > 0.0 {
if w_i == max_w { if w_i == 0 {
0 max_w
} else { } else {
w_i.wrapping_add(1) w_i.wrapping_sub(1)
} }
} else if w_i == 0 { } else if w_i == max_w {
max_w 0
} else { } else {
w_i.wrapping_sub(1) w_i.wrapping_add(1)
}; };
state.scroll = 0.0;
if let Some(w) = w_g.workspaces.get(d_i) { if let Some(w) = w_g.workspaces.get(d_i) {
w.handle.activate(); w.handle.activate();
state state
@ -181,6 +191,7 @@ pub struct State {
registry_state: RegistryState, registry_state: RegistryState,
workspace_state: WorkspaceState, workspace_state: WorkspaceState,
have_workspaces: bool, have_workspaces: bool,
scroll: f64,
} }
impl State { impl State {