diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs index 459f7a697177c4cd6776ebf5838307eaa794bb27..16d31ca699bfc984ceaa49c6bda2e38d66da13f7 100644 --- a/crates/workspace/src/dock.rs +++ b/crates/workspace/src/dock.rs @@ -835,16 +835,6 @@ impl Dock { } pub fn resize_active_panel( - &mut self, - size: Option, - window: &mut Window, - cx: &mut Context, - ) { - let ratio = size.and_then(|size| self.flexible_size_ratio_for_pixels(size, window, cx)); - self.resize_active_panel_with_ratio(size, ratio, window, cx); - } - - pub fn resize_active_panel_with_ratio( &mut self, size: Option, ratio: Option, @@ -878,16 +868,6 @@ impl Dock { } pub fn resize_all_panels( - &mut self, - size: Option, - window: &mut Window, - cx: &mut Context, - ) { - let ratio = size.and_then(|size| self.flexible_size_ratio_for_pixels(size, window, cx)); - self.resize_all_panels_with_ratio(size, ratio, window, cx); - } - - pub fn resize_all_panels_with_ratio( &mut self, size: Option, ratio: Option, @@ -975,18 +955,6 @@ impl Dock { .unwrap_or_else(|| entry.panel.default_size(window, cx)) } - fn flexible_size_ratio_for_pixels( - &self, - size: Pixels, - window: &Window, - cx: &App, - ) -> Option { - let workspace = self.workspace.upgrade()?; - workspace - .read(cx) - .flexible_dock_ratio_for_size(self.position, size, window, cx) - } - pub(crate) fn load_persisted_size_state( workspace: &Workspace, panel_key: &'static str, @@ -1059,7 +1027,7 @@ impl Render for Dock { MouseButton::Left, cx.listener(|dock, e: &MouseUpEvent, window, cx| { if e.click_count == 2 { - dock.resize_active_panel(None, window, cx); + dock.resize_active_panel(None, None, window, cx); dock.workspace .update(cx, |workspace, cx| { workspace.serialize_workspace(window, cx); diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs index 4dc3599db3e0956eee8ad5d98f8c54329376465e..d5cb3bf5e63ff333cd050f75536bf8de18ff372e 100644 --- a/crates/workspace/src/workspace.rs +++ b/crates/workspace/src/workspace.rs @@ -7369,9 +7369,9 @@ impl Workspace { .resize_all_panels_in_dock .contains(&DockPosition::Left) { - left_dock.resize_all_panels_with_ratio(Some(size), ratio, window, cx); + left_dock.resize_all_panels(Some(size), ratio, window, cx); } else { - left_dock.resize_active_panel_with_ratio(Some(size), ratio, window, cx); + left_dock.resize_active_panel(Some(size), ratio, window, cx); } }); } @@ -7393,9 +7393,9 @@ impl Workspace { .resize_all_panels_in_dock .contains(&DockPosition::Right) { - right_dock.resize_all_panels_with_ratio(Some(size), ratio, window, cx); + right_dock.resize_all_panels(Some(size), ratio, window, cx); } else { - right_dock.resize_active_panel_with_ratio(Some(size), ratio, window, cx); + right_dock.resize_active_panel(Some(size), ratio, window, cx); } }); } @@ -7407,9 +7407,9 @@ impl Workspace { .resize_all_panels_in_dock .contains(&DockPosition::Bottom) { - bottom_dock.resize_all_panels(Some(size), window, cx); + bottom_dock.resize_all_panels(Some(size), None, window, cx); } else { - bottom_dock.resize_active_panel(Some(size), window, cx); + bottom_dock.resize_active_panel(Some(size), None, window, cx); } }); }