From 9c196b99c9b0e51b41821d8f3763572e491165fc Mon Sep 17 00:00:00 2001 From: Javier Portillo <17260001+javierportillo@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:10:32 -0600 Subject: [PATCH] feat(grid): adds no-operations for Promote and PromoteFocus commands --- komorebi/src/window_manager.rs | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/komorebi/src/window_manager.rs b/komorebi/src/window_manager.rs index 8041b8f9..bbebd2f0 100644 --- a/komorebi/src/window_manager.rs +++ b/komorebi/src/window_manager.rs @@ -1487,6 +1487,16 @@ impl WindowManager { tracing::info!("promoting container"); let workspace = self.focused_workspace_mut()?; + + // NoOp on Grid layout + match workspace.layout() { + Layout::Default(layout) => match layout { + DefaultLayout::Grid => return Ok(()), + _ => (), + }, + _ => (), + } + workspace.promote_container()?; self.update_focused_workspace(self.mouse_follows_focus) } @@ -1499,7 +1509,11 @@ impl WindowManager { let workspace = self.focused_workspace_mut()?; let target_idx = match workspace.layout() { - Layout::Default(_) => 0, + Layout::Default(layout) => match layout { + // NoOp on Grid layout + DefaultLayout::Grid => return Ok(()), + _ => 0, + }, Layout::Custom(custom) => custom .first_container_idx(custom.primary_idx().map_or(0, |primary_idx| primary_idx)), };