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 <ogulcancelik@gmail.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/client/shell/endpoint_navigation.rs b/src/client/shell/endpoint_navigation.rs
index adb29c93..4f528c3a 100644
--- a/src/client/shell/endpoint_navigation.rs
+++ b/src/client/shell/endpoint_navigation.rs
@@ -59,16 +59,16 @@ impl ClientShellState {
         point: (u16, u16),
         outcome: &mut ClientShellInput,
     ) -> bool {
-        let Some(endpoint_id) = self
+        let Some(hit) = self
             .hits
             .machines
             .iter()
             .find(|hit| super::contains(hit.rect, point))
-            .map(|hit| hit.endpoint_id.clone())
         else {
             return false;
         };
-        if endpoint_id == self.active_endpoint_id {
+        let endpoint_id = hit.endpoint_id.clone();
+        if super::contains(hit.collapse_toggle, point) || endpoint_id == self.active_endpoint_id {
             if !self.collapsed_endpoints.remove(&endpoint_id) {
                 self.collapsed_endpoints.insert(endpoint_id);
             }