From ec88a6886ffccb6b6b22d27832bca81ec871b768 Mon Sep 17 00:00:00 2001 From: Ben Kunkle Date: Fri, 28 Feb 2025 17:47:15 -0600 Subject: [PATCH] Fix active pane modifiers applying to parent pane axis if child pane is active (#25836) Closes #25304 Release Notes: - Fixed an issue where `active_pane_modifiers` settings would be applied to a parent pane if one of it's child panes was active --- crates/workspace/src/pane_group.rs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs index 0b2cc55e3b..58ae40c536 100644 --- a/crates/workspace/src/pane_group.rs +++ b/crates/workspace/src/pane_group.rs @@ -214,13 +214,6 @@ impl Member { Member::Axis(PaneAxis::new(axis, members)) } - fn contains(&self, needle: &Entity) -> bool { - match self { - Member::Axis(axis) => axis.members.iter().any(|member| member.contains(needle)), - Member::Pane(pane) => pane == needle, - } - } - fn first_pane(&self) -> Entity { match self { Member::Axis(axis) => axis.members[0].first_pane(), @@ -702,7 +695,7 @@ impl PaneAxis { cx.entity().downgrade(), ) .children(self.members.iter().enumerate().map(|(ix, member)| { - if member.contains(active_pane) { + if matches!(member, Member::Pane(pane) if pane == active_pane) { active_pane_ix = Some(ix); } member