diff --git a/assets/settings/default.json b/assets/settings/default.json index 7c0688831d..d4bfc4e9f7 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -73,9 +73,6 @@ "unnecessary_code_fade": 0.3, // Active pane styling settings. "active_pane_modifiers": { - // The factor to grow the active pane by. Defaults to 1.0 - // which gives the same size as all other panes. - "magnification": 1.0, // Inset border size of the active pane, in pixels. "border_size": 0.0, // Opacity of the inactive panes. 0 means transparent, 1 means opaque. diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs index 2f6d0847df..7e5e77f97b 100644 --- a/crates/workspace/src/pane_group.rs +++ b/crates/workspace/src/pane_group.rs @@ -1155,16 +1155,7 @@ mod element { debug_assert!(flexes.len() == len); debug_assert!(flex_values_in_bounds(flexes.as_slice())); - let active_pane_magnification = WorkspaceSettings::get(None, cx) - .active_pane_modifiers - .magnification - .and_then(|val| if val == 1.0 { None } else { Some(val) }); - - let total_flex = if let Some(flex) = active_pane_magnification { - self.children.len() as f32 - 1. + flex - } else { - len as f32 - }; + let total_flex = len as f32; let mut origin = bounds.origin; let space_per_flex = bounds.size.along(self.axis) / total_flex; @@ -1177,15 +1168,7 @@ mod element { children: Vec::new(), }; for (ix, mut child) in mem::take(&mut self.children).into_iter().enumerate() { - let child_flex = active_pane_magnification - .map(|magnification| { - if self.active_pane_ix == Some(ix) { - magnification - } else { - 1. - } - }) - .unwrap_or_else(|| flexes[ix]); + let child_flex = flexes[ix]; let child_size = bounds .size @@ -1214,7 +1197,7 @@ mod element { } for (ix, child_layout) in layout.children.iter_mut().enumerate() { - if active_pane_magnification.is_none() && ix < len - 1 { + if ix < len - 1 { child_layout.handle = Some(Self::layout_handle( self.axis, child_layout.bounds, diff --git a/crates/workspace/src/workspace_settings.rs b/crates/workspace/src/workspace_settings.rs index 3c1838be97..748f08ffba 100644 --- a/crates/workspace/src/workspace_settings.rs +++ b/crates/workspace/src/workspace_settings.rs @@ -51,12 +51,6 @@ impl OnLastWindowClosed { #[derive(Copy, Clone, Debug, Default, Serialize, Deserialize, JsonSchema)] #[serde(rename_all = "snake_case")] pub struct ActivePanelModifiers { - /// Scale by which to zoom the active pane. - /// When set to 1.0, the active pane has the same size as others, - /// but when set to a larger value, the active pane takes up more space. - /// - /// Default: `1.0` - pub magnification: Option, /// Size of the border surrounding the active pane. /// When set to 0, the active pane doesn't have any border. /// The border is drawn inset. diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md index 88e08c12e1..d32cd87003 100644 --- a/docs/src/configuring-zed.md +++ b/docs/src/configuring-zed.md @@ -38,23 +38,12 @@ Extensions that provide language servers may also provide default settings for t ```json { "active_pane_modifiers": { - "magnification": 1.0, "border_size": 0.0, "inactive_opacity": 1.0 } } ``` -### Magnification - -- Description: Scale by which to zoom the active pane. When set to `1.0`, the active pane has the same size as others, but when set to a larger value, the active pane takes up more space. -- Setting: `magnification` -- Default: `1.0` - -**Options** - -`float` values - ### Border size - Description: Size of the border surrounding the active pane. When set to 0, the active pane doesn't have any border. The border is drawn inset. diff --git a/docs/src/fonts.md b/docs/src/fonts.md index b68bcc529e..93c687b134 100644 --- a/docs/src/fonts.md +++ b/docs/src/fonts.md @@ -31,8 +31,6 @@ TBD: Explain various font settings in Zed. - `terminal.font-size` - `terminal.font-family` - `terminal.font-features` -- Other settings: - - `active-pane-magnification` ## Old Zed Fonts