YaLTeR/niri
1
1
Fork 0
mirror of https://github.com/YaLTeR/niri.git synced 2024-09-20 16:58:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Place new workspace after current when moving

Browse Source 
This feels more natural, also makes moving back and forth idempotent in
most cases.
This commit is contained in:
Ivan Molodetskikh 2024-02-03 08:42:56 +04:00
parent fbe9020915
commit 1f72089a46
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/layout/mod.rs
View File

@ -29,6 +29,7 @@
//! compromise we only keep the first workspace there, and move the rest to the primary output,
//! making the primary output their original output.
use std::cmp::min;
use std::mem;
use std::rc::Rc;
use std::time::Duration;
@ -1364,7 +1365,12 @@ impl<W: LayoutElement> Layout<W> {
.position(|mon| &mon.output == output)
.unwrap();
let target = &mut monitors[target_idx];
target.workspaces.insert(target.active_workspace_idx, ws);
// Insert the workspace after the currently active one. Unless the currently active one is
// the last empty workspace, then insert before.
let target_ws_idx = min(target.active_workspace_idx + 1, target.workspaces.len() - 1);
target.workspaces.insert(target_ws_idx, ws);
target.active_workspace_idx = target_ws_idx;
target.workspace_switch = None;
target.clean_up_workspaces();