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

tiling: Fix minimize duration

Browse source
This commit is contained in:
Victoria Brekenfeld 2024-02-29 17:42:48 +01:00 • committed by Victoria Brekenfeld
parent 4f55f4127b
commit fa5af98b9d
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1280,7 +1280,7 @@ impl TilingLayout {
} }
pub fn unmap(&mut self, window: &CosmicMapped) -> bool { pub fn unmap(&mut self, window: &CosmicMapped) -> bool {
if self.unmap_window_internal(window) { if self.unmap_window_internal(window, false) {
window.output_leave(&self.output); window.output_leave(&self.output);
window.set_tiled(false); window.set_tiled(false);
*window.tiling_node_id.lock().unwrap() = None; *window.tiling_node_id.lock().unwrap() = None;
@ -1355,7 +1355,7 @@ impl TilingLayout {
}) })
}; };
if self.unmap_window_internal(window) { if self.unmap_window_internal(window, true) {
let tree = &mut self let tree = &mut self
.queue .queue
.trees .trees
@ -1375,7 +1375,7 @@ impl TilingLayout {
state state
} }
fn unmap_window_internal(&mut self, mapped: &CosmicMapped) -> bool { fn unmap_window_internal(&mut self, mapped: &CosmicMapped, minimizing: bool) -> bool {
let tiling_node_id = mapped.tiling_node_id.lock().unwrap().as_ref().cloned(); let tiling_node_id = mapped.tiling_node_id.lock().unwrap().as_ref().cloned();
let gaps = self.gaps(); let gaps = self.gaps();
@ -1394,8 +1394,13 @@ impl TilingLayout {
TilingLayout::unmap_internal(&mut tree, &node_id); TilingLayout::unmap_internal(&mut tree, &node_id);
let duration = if minimizing {
MINIMIZE_ANIMATION_DURATION
} else {
ANIMATION_DURATION
};
let blocker = TilingLayout::update_positions(&self.output, &mut tree, gaps); let blocker = TilingLayout::update_positions(&self.output, &mut tree, gaps);
self.queue.push_tree(tree, ANIMATION_DURATION, blocker); self.queue.push_tree(tree, duration, blocker);
return true; return true;
} }
@ -2306,7 +2311,7 @@ impl TilingLayout {
.filter(|w| !w.alive()) .filter(|w| !w.alive())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
for dead_window in dead_windows.iter() { for dead_window in dead_windows.iter() {
self.unmap_window_internal(dead_window); self.unmap_window_internal(dead_window, false);
} }
for (mapped, _) in self.mapped() { for (mapped, _) in self.mapped() {