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

shell: Tile windows moved to a tiled workspace

Browse source
This commit is contained in:
Victoria Brekenfeld 2025-11-11 16:30:56 +01:00 • committed by Jeremy Soller
parent 7e63b99cd5
commit c1e5a3ee3d
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/shell/mod.rs
View file

@ -3112,9 +3112,8 @@ impl Shell {
let to_mapped = to_workspace.mapped().cloned().collect::<Vec<_>>(); let to_mapped = to_workspace.mapped().cloned().collect::<Vec<_>>();
let focus_target: KeyboardFocusTarget = let focus_target: KeyboardFocusTarget =
if matches!(window_state, WorkspaceRestoreData::Floating(_)) if !matches!(window_state, WorkspaceRestoreData::Fullscreen(_))
|| (matches!(window_state, WorkspaceRestoreData::Tiling(_)) && !to_workspace.tiling_enabled
&& !to_workspace.tiling_enabled)
{ {
let mapped = CosmicMapped::from(CosmicWindow::new( let mapped = CosmicMapped::from(CosmicWindow::new(
window.clone(), window.clone(),
@ -3129,7 +3128,9 @@ impl Shell {
}; };
to_workspace.floating_layer.map(mapped.clone(), position); to_workspace.floating_layer.map(mapped.clone(), position);
mapped.into() mapped.into()
} else if matches!(window_state, WorkspaceRestoreData::Tiling(_)) { } else if !matches!(window_state, WorkspaceRestoreData::Fullscreen(_))
&& to_workspace.tiling_enabled
{
let mapped = CosmicMapped::from(CosmicWindow::new( let mapped = CosmicMapped::from(CosmicWindow::new(
window.clone(), window.clone(),
evlh.clone(), evlh.clone(),
@ -3219,8 +3220,7 @@ impl Shell {
}; };
let to_workspace = self.workspaces.space_for_handle_mut(to).unwrap(); // checked above let to_workspace = self.workspaces.space_for_handle_mut(to).unwrap(); // checked above
if matches!(window_state, WorkspaceRestoreData::Floating(_)) || !to_workspace.tiling_enabled if !to_workspace.tiling_enabled {
{
let position = match window_state { let position = match window_state {
WorkspaceRestoreData::Floating(Some(data)) => { WorkspaceRestoreData::Floating(Some(data)) => {
Some(data.position_relative(to_workspace.output.geometry().size.as_logical())) Some(data.position_relative(to_workspace.output.geometry().size.as_logical()))
@ -3228,7 +3228,7 @@ impl Shell {
_ => None, _ => None,
}; };
to_workspace.floating_layer.map(mapped.clone(), position); to_workspace.floating_layer.map(mapped.clone(), position);
} else if matches!(window_state, WorkspaceRestoreData::Tiling(_)) { } else {
for mapped in to_workspace for mapped in to_workspace
.mapped() .mapped()
.filter(|m| m.maximized_state.lock().unwrap().is_some()) .filter(|m| m.maximized_state.lock().unwrap().is_some())
@ -3244,8 +3244,6 @@ impl Shell {
focus_stack.as_ref().map(|x| x.iter()), focus_stack.as_ref().map(|x| x.iter()),
direction, direction,
); );
} else {
unreachable!() // TODO: sticky
} }
let focus_target = KeyboardFocusTarget::from(mapped.clone()); let focus_target = KeyboardFocusTarget::from(mapped.clone());