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

tiling: Consider direction when moving across workspaces and outputs

Browse source 
Fixes second case of #113.
This commit is contained in:
Victoria Brekenfeld 2023-05-25 17:51:53 +02:00
parent bf0eb97bea
commit 2f6d4da712
4 changed files with 113 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/shell/mod.rs
View file

@ -54,7 +54,7 @@ use self::{
grabs::ResizeEdge,
layout::{
floating::FloatingLayout,
tiling::{TilingLayout, ANIMATION_DURATION},
tiling::{Direction, TilingLayout, ANIMATION_DURATION},
},
};
@ -1204,7 +1204,7 @@ impl Shell {
let focus_stack = workspace.focus_stack.get(&seat);
workspace
.tiling_layer
.map(mapped.clone(), &seat, focus_stack.iter());
.map(mapped.clone(), &seat, focus_stack.iter(), None);
}
if let CosmicSurface::X11(_) = window {
@ -1275,6 +1275,7 @@ impl Shell {
from_output: &Output,
to: (&Output, Option<usize>),
follow: bool,
direction: Option<Direction>,
) -> Result<Option<Point<i32, Logical>>, InvalidWorkspaceIndex> {
let (to_output, to_idx) = to;
let to_idx = to_idx.unwrap_or(state.common.shell.workspaces.active_num(to_output).1);
@ -1338,7 +1339,7 @@ impl Shell {
} else {
to_workspace
.tiling_layer
.map(mapped.clone(), &seat, focus_stack.iter());
.map(mapped.clone(), &seat, focus_stack.iter(), direction);
}
for (toplevel, _) in mapped.windows() {
if from_output != to_output {