From 68c7b78ec237034cbb0e21c8666842ed7991641d Mon Sep 17 00:00:00 2001 From: akbash Date: Tue, 8 Sep 2026 17:51:59 +0300 Subject: fix: collapse worktree groups with saved machines (#3781) * fix: collapse worktree groups with saved machines refs #3778 * fix: scope worktree collapse by machine refs #3778 * fix: collapse machines without switching focus refs #3778 --------- Co-authored-by: akbash-bot <300245827+akbash-bot@users.noreply.github.com> Co-authored-by: Ogulcan Celik --- src/client/shell/context_menu.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/client/shell/context_menu.rs') diff --git a/src/client/shell/context_menu.rs b/src/client/shell/context_menu.rs index af271bb6..926510c5 100644 --- a/src/client/shell/context_menu.rs +++ b/src/client/shell/context_menu.rs @@ -106,8 +106,9 @@ impl ClientShellState { .count() >= 2 }); - let collapsed = - worktree.is_some_and(|worktree| self.collapsed_groups.contains(&worktree.key)); + let collapsed = worktree.is_some_and(|worktree| { + self.group_is_collapsed(&self.active_endpoint_id, &worktree.key) + }); self.overlay = Some(ClientShellOverlay::ContextMenu(ClientContextMenuOverlay { target: ClientContextMenuTarget::Workspace { workspace_id, @@ -279,9 +280,8 @@ impl ClientShellState { .map(|worktree| worktree.key.clone()) }); if let Some(key) = key { - if !self.collapsed_groups.remove(&key) { - self.collapsed_groups.insert(key); - } + let endpoint_id = self.active_endpoint_id.clone(); + self.toggle_collapsed_group(&endpoint_id, key); self.persist_chrome_preferences(outcome); } } -- cgit v1.2.3