Add smart window gaps

pop-os · Aug 29, 2024 · cd4d372 · cd4d372
1 parent 59b0e0e
commit cd4d372
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 60 deletions.
diff --git a/cosmic-comp-config/src/lib.rs b/cosmic-comp-config/src/lib.rs
@@ -23,6 +23,8 @@ pub struct CosmicCompConfig {
     pub autotile_behavior: TileBehavior,
     /// Active hint enabled
     pub active_hint: bool,
+    /// Smart gaps enabled
+    pub smart_gaps: bool,
 }
 
 impl Default for CosmicCompConfig {
@@ -48,6 +50,7 @@ impl Default for CosmicCompConfig {
             autotile: Default::default(),
             autotile_behavior: Default::default(),
             active_hint: true,
+            smart_gaps: Default::default(),
         }
     }
 }

diff --git a/src/config/mod.rs b/src/config/mod.rs
@@ -651,6 +651,13 @@ fn config_changed(config: cosmic_config::Config, keys: Vec<String>, state: &mut
                     state.common.update_config();
                 }
             }
+            "smart_gaps" => {
+                let new = get_config::<bool>(&config, "smart_gaps");
+                if new != state.common.config.cosmic_conf.smart_gaps {
+                    state.common.config.cosmic_conf.smart_gaps = new;
+                    state.common.update_config();
+                }
+            }
             _ => {}
         }
     }

diff --git a/src/shell/layout/tiling/grabs/resize.rs b/src/shell/layout/tiling/grabs/resize.rs
@@ -224,6 +224,7 @@ impl ResizeForkGrab {
             let mut shell = data.common.shell.write().unwrap();
             let tiling_layer = &mut shell.active_space_mut(&output).tiling_layer;
             let gaps = tiling_layer.gaps();
+            let is_smart_gaps = data.common.config.cosmic_conf.smart_gaps;
 
             let tree = &mut tiling_layer.queue.trees.back_mut().unwrap().0;
             match &mut self.old_tree {
@@ -317,7 +318,7 @@ impl ResizeForkGrab {
                 }
 
                 self.last_loc = location.as_global();
-                let blocker = TilingLayout::update_positions(&output, tree, gaps);
+                let blocker = TilingLayout::update_positions(&output, tree, gaps, is_smart_gaps);
                 tiling_layer.pending_blockers.extend(blocker);
             } else {
                 return true;