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

fix: only move the grabbed window if a new zone is chosen

Browse source 
This should fix super+click on a tiled window poping it out of the tree
and tiling it to the right half of the screen (default drop window
behavior).
This commit is contained in:
Hojjat 2026-01-15 17:24:56 -07:00 • committed by Victoria Brekenfeld
parent 816df0cf2b
commit 1dfc948f1e
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/shell/layout/tiling/mod.rs
View file

@ -1384,6 +1384,13 @@ impl TilingLayout {
) -> Option<NodeId> { ) -> Option<NodeId> {
let node_id = window.tiling_node_id.lock().unwrap().take()?; let node_id = window.tiling_node_id.lock().unwrap().take()?;
// Initialize last_overview_hover to the placeholder position so that
// dropping without mouse movement restores the window to its original position
if matches!(type_, PlaceholderType::GrabbedWindow) {
self.last_overview_hover =
Some((None, TargetZone::InitialPlaceholder(node_id.clone())));
}
let data = self let data = self
.queue .queue
.trees .trees
@ -2666,7 +2673,7 @@ impl TilingLayout {
window.set_bounds(layer_map.non_exclusive_zone().size); window.set_bounds(layer_map.non_exclusive_zone().size);
} }
let mapped = match self.last_overview_hover.as_ref().map(|x| &x.1) { let mapped = match self.last_overview_hover.as_ref().map(|(_, zone)| zone) {
Some(TargetZone::GroupEdge(group_id, direction)) if tree.get(group_id).is_ok() => { Some(TargetZone::GroupEdge(group_id, direction)) if tree.get(group_id).is_ok() => {
let new_id = tree let new_id = tree
.insert( .insert(
@ -4039,7 +4046,7 @@ impl TilingLayout {
let is_overview = !matches!(overview.0, OverviewMode::None); let is_overview = !matches!(overview.0, OverviewMode::None);
let is_mouse_tiling = (matches!(overview.0.trigger(), Some(Trigger::Pointer(_)))) let is_mouse_tiling = (matches!(overview.0.trigger(), Some(Trigger::Pointer(_))))
.then(|| self.last_overview_hover.as_ref().map(|x| &x.1)); .then(|| self.last_overview_hover.as_ref().map(|(_, zone)| zone));
let swap_desc = if let Some(Trigger::KeyboardSwap(_, desc)) = overview.0.trigger() { let swap_desc = if let Some(Trigger::KeyboardSwap(_, desc)) = overview.0.trigger() {
Some(desc.clone()) Some(desc.clone())
} else { } else {
@ -4190,7 +4197,7 @@ impl TilingLayout {
let mut elements = Vec::default(); let mut elements = Vec::default();
let is_mouse_tiling = (matches!(overview.0.trigger(), Some(Trigger::Pointer(_)))) let is_mouse_tiling = (matches!(overview.0.trigger(), Some(Trigger::Pointer(_))))
.then(|| self.last_overview_hover.as_ref().map(|x| &x.1)); .then(|| self.last_overview_hover.as_ref().map(|(_, zone)| zone));
let swap_desc = if let Some(Trigger::KeyboardSwap(_, desc)) = overview.0.trigger() { let swap_desc = if let Some(Trigger::KeyboardSwap(_, desc)) = overview.0.trigger() {
Some(desc.clone()) Some(desc.clone())
} else { } else {