Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
workspace: Add ToggleEditorZoom action to maximize active pane (#53911)
Ollie Rutherfurdfca4016aef04
diff --git a/crates/debugger_ui/src/session/running.rs b/crates/debugger_ui/src/session/running.rsindex bce007f8b0a..1226055eb3f 100644--- a/crates/debugger_ui/src/session/running.rs+++ b/crates/debugger_ui/src/session/running.rs@@ -115,6 +115,7 @@ impl Render for RunningState {} else if let Some(active) = active {self.panes.render(+ None,None,&ActivePaneDecorator::new(active, &self.workspace),window,diff --git a/crates/terminal_view/src/terminal_panel.rs b/crates/terminal_view/src/terminal_panel.rsindex e1f31c3614c..602667c725a 100644--- a/crates/terminal_view/src/terminal_panel.rs+++ b/crates/terminal_view/src/terminal_panel.rs@@ -1364,6 +1364,7 @@ impl Render for TerminalPanel {.update(cx, |workspace, cx| {registrar.size_full().child(self.center.render(workspace.zoomed_item(),+ None,&workspace::PaneRenderContext {follower_states: &HashMap::default(),active_call: workspace.active_call(),diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rsindex 6b5a3cafaba..dcd0b091a3f 100644--- a/crates/workspace/src/pane_group.rs+++ b/crates/workspace/src/pane_group.rs@@ -228,11 +228,14 @@ impl PaneGroup {pub fn render(&self,zoomed: Option<&AnyWeakView>,+ maximized: Option<&WeakEntity<Pane>>,render_cx: &dyn PaneLeaderDecorator,window: &mut Window,cx: &mut App,) -> impl IntoElement {- self.root.render(0, zoomed, render_cx, window, cx).element+ self.root+ .render(0, zoomed, maximized, render_cx, window, cx)+ .element}pub fn panes(&self) -> Vec<&Entity<Pane>> {@@ -528,6 +531,7 @@ impl Member {&self,basis: usize,zoomed: Option<&AnyWeakView>,+ maximized: Option<&WeakEntity<Pane>>,render_cx: &dyn PaneLeaderDecorator,window: &mut Window,cx: &mut App,@@ -541,6 +545,15 @@ impl Member {};}+ if let Some(maximized) = maximized {+ if maximized.upgrade().as_ref() != Some(pane) {+ return PaneRenderResult {+ element: div().into_any(),+ contains_active_pane: false,+ };+ }+ }+let decoration = render_cx.decorate(pane, cx);let is_active = pane == render_cx.active_pane();@@ -569,7 +582,17 @@ impl Member {contains_active_pane: is_active,}}- Member::Axis(axis) => axis.render(basis + 1, zoomed, render_cx, window, cx),+ Member::Axis(axis) => axis.render(basis + 1, zoomed, maximized, render_cx, window, cx),+ }+ }++ pub fn contains_pane(&self, needle: &Entity<Pane>) -> bool {+ match self {+ Member::Pane(pane) => pane == needle,+ Member::Axis(axis) => axis+ .members+ .iter()+ .any(|member| member.contains_pane(needle)),}}@@ -922,10 +945,28 @@ impl PaneAxis {&self,basis: usize,zoomed: Option<&AnyWeakView>,+ maximized: Option<&WeakEntity<Pane>>,render_cx: &dyn PaneLeaderDecorator,window: &mut Window,cx: &mut App,) -> PaneRenderResult {+ if let Some(maximized) = maximized {+ if let Some(maximized_pane) = maximized.upgrade() {+ for member in &self.members {+ if member.contains_pane(&maximized_pane) {+ return member.render(+ basis,+ zoomed,+ Some(maximized),+ render_cx,+ window,+ cx,+ );+ }+ }+ }+ }+debug_assert!(self.members.len() == self.flexes.lock().len());let mut active_pane_ix = None;let mut contains_active_pane = false;@@ -949,7 +990,7 @@ impl PaneAxis {}}- let result = member.render((basis + ix) * 10, zoomed, render_cx, window, cx);+ let result = member.render((basis + ix) * 10, zoomed, None, render_cx, window, cx);if result.contains_active_pane {contains_active_pane = true;}diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rsindex 23c9a5cf557..ace71b3de14 100644--- a/crates/workspace/src/workspace.rs+++ b/crates/workspace/src/workspace.rs@@ -339,6 +339,9 @@ actions!(ToggleRightDock,/// Toggles zoom on the active pane.ToggleZoom,+ /// Toggles maximizing the active editor pane within the center area,+ /// hiding other split panes but leaving docks/panels unaffected.+ ToggleEditorZoom,/// Toggles read-only mode for the active item (if supported by that item).ToggleReadOnlyFile,/// Zooms in on the active pane.@@ -1370,6 +1373,7 @@ pub struct Workspace {zoomed: Option<AnyWeakView>,previous_dock_drag_coordinates: Option<Point<Pixels>>,zoomed_position: Option<DockPosition>,+ maximized_pane: Option<WeakEntity<Pane>>,center: PaneGroup,left_dock: Entity<Dock>,bottom_dock: Entity<Dock>,@@ -1821,6 +1825,7 @@ impl Workspace {weak_self: weak_handle.clone(),zoomed: None,zoomed_position: None,+ maximized_pane: None,previous_dock_drag_coordinates: None,center,panes: vec![center_pane.clone()],@@ -5540,6 +5545,13 @@ impl Workspace {None});+ if let Some(maximized) = &self.maximized_pane {+ let is_center_pane = self.panes.contains(&pane);+ if is_center_pane && maximized.upgrade().as_ref() != Some(&pane) {+ self.maximized_pane = None;+ }+ }+self.dismiss_zoomed_items_to_reveal(dock_to_preserve, window, cx);if pane.read(cx).is_zoomed() {self.zoomed = Some(pane.downgrade().into());@@ -5678,6 +5690,7 @@ impl Workspace {}pane::Event::ZoomIn => {if *pane == self.active_pane {+ self.maximized_pane = None;pane.update(cx, |pane, cx| pane.set_zoomed(true, cx));if pane.read(cx).has_focus(window, cx) {self.zoomed = Some(pane.downgrade().into());@@ -5817,6 +5830,15 @@ impl Workspace {cx: &mut Context<Self>,) {if self.center.remove(&pane, cx).unwrap() {+ if self+ .maximized_pane+ .as_ref()+ .and_then(|weak| weak.upgrade())+ .as_ref()+ == Some(&pane)+ {+ self.maximized_pane = None;+ }self.force_remove_pane(&pane, &focus_on, window, cx);self.unfollow_in_pane(&pane, window, cx);self.last_leaders_by_pane.remove(&pane.downgrade());@@ -7731,6 +7753,7 @@ impl Workspace {},)).on_action(cx.listener(Workspace::toggle_centered_layout))+ .on_action(cx.listener(Workspace::toggle_editor_zoom)).on_action(cx.listener(|workspace: &mut Workspace, action: &pane::ActivateNextItem, window, cx| {if let Some(active_dock) = workspace.active_dock(window, cx) {@@ -7995,6 +8018,37 @@ impl Workspace {});}+ pub fn toggle_editor_zoom(+ &mut self,+ _: &ToggleEditorZoom,+ window: &mut Window,+ cx: &mut Context<Self>,+ ) {+ if self.zoomed.is_some() {+ self.active_pane.update(cx, |pane, cx| {+ pane.set_zoomed(false, cx);+ });+ self.zoomed = None;+ self.zoomed_position = None;+ cx.emit(Event::ZoomChanged);+ }++ if let Some(maximized) = self.maximized_pane.take() {+ if maximized.upgrade().as_ref() == Some(&self.active_pane) {+ cx.notify();+ return;+ }+ }++ self.maximized_pane = Some(self.active_pane.downgrade());+ window.focus(&self.active_pane.focus_handle(cx), cx);+ cx.notify();+ }++ pub fn is_pane_maximized(&self) -> bool {+ self.maximized_pane.is_some()+ }+fn adjust_padding(padding: Option<f32>) -> f32 {padding.unwrap_or(CenteredPaddingSettings::default().0)@@ -8255,10 +8309,13 @@ impl Workspace {this.track_focus(&self.region_focus_handles.editor)}).size_full()- .child(- self.center- .render(self.zoomed.as_ref(), render_cx, window, cx),- )+ .child(self.center.render(+ self.zoomed.as_ref(),+ self.maximized_pane.as_ref(),+ render_cx,+ window,+ cx,+ ))}pub fn for_window(window: &Window, cx: &App) -> Option<Entity<Workspace>> {@@ -13571,6 +13628,75 @@ mod tests {});}+ #[gpui::test]+ async fn test_toggle_editor_zoom(cx: &mut TestAppContext) {+ init_test(cx);+ let fs = FakeFs::new(cx.executor());+ let project = Project::test(fs, [], cx).await;+ let (workspace, cx) =+ cx.add_window_view(|window, cx| Workspace::test_new(project, window, cx));++ let pane_a = workspace.update_in(cx, |workspace, _window, _cx| {+ workspace.active_pane().clone()+ });++ workspace.update_in(cx, |workspace, window, cx| {+ let item = cx.new(TestItem::new);+ workspace.add_item(pane_a.clone(), Box::new(item), None, true, true, window, cx);+ });++ let pane_b = split_pane(cx, &workspace);+ workspace.update_in(cx, |workspace, window, cx| {+ let item = cx.new(TestItem::new);+ workspace.add_item(pane_b.clone(), Box::new(item), None, true, true, window, cx);+ });++ // Toggle editor zoom maximizes the active pane+ workspace.update_in(cx, |workspace, window, cx| {+ workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);+ assert!(workspace.is_pane_maximized());+ assert_eq!(+ workspace.maximized_pane.as_ref().and_then(|w| w.upgrade()),+ Some(pane_b.clone()),+ );+ });++ // Toggle again un-maximizes+ workspace.update_in(cx, |workspace, window, cx| {+ workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);+ assert!(!workspace.is_pane_maximized());+ });++ // Toggle editor zoom while zoomed: should unzoom then maximize+ pane_b.update_in(cx, |pane, window, cx| {+ pane.zoom_in(&ZoomIn, window, cx);+ });+ workspace.update_in(cx, |_workspace, _window, cx| {+ assert!(pane_b.read(cx).is_zoomed());+ });+ workspace.update_in(cx, |workspace, window, cx| {+ workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);+ assert!(!pane_b.read(cx).is_zoomed());+ assert!(workspace.zoomed.is_none());+ assert!(workspace.is_pane_maximized());+ });++ // Un-maximize for next test+ workspace.update_in(cx, |workspace, window, cx| {+ workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);+ });++ // Maximized pane cleared when it is removed+ workspace.update_in(cx, |workspace, window, cx| {+ workspace.toggle_editor_zoom(&ToggleEditorZoom, window, cx);+ assert!(workspace.is_pane_maximized());+ });+ workspace.update_in(cx, |workspace, window, cx| {+ workspace.remove_pane(pane_b.clone(), None, window, cx);+ assert!(!workspace.is_pane_maximized());+ });+ }+#[gpui::test]async fn test_toggle_all_docks(cx: &mut gpui::TestAppContext) {init_test(cx);