Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

workspace: Fix bottom dock clipping when resizing windows (#61161)

ᴀᴍᴛᴏᴀᴇʀac09219cad65
diff --git a/crates/workspace/src/dock.rs b/crates/workspace/src/dock.rs
index 139da5f7a93..b61830d67e3 100644
--- a/crates/workspace/src/dock.rs
+++ b/crates/workspace/src/dock.rs
@@ -1050,8 +1050,9 @@ impl Dock {
let max_size = (max_size - RESIZE_HANDLE_SIZE).abs();
let mut clamped = false;
for entry in &mut self.panel_entries {
- let use_flexible = entry.panel.has_flexible_size(window, cx);
- if use_flexible {
+ let uses_flexible_width =
+ panel_uses_flexible_width(self.position, entry.panel.as_ref(), window, cx);
+ if uses_flexible_width {
continue;
}
diff --git a/crates/workspace/src/workspace.rs b/crates/workspace/src/workspace.rs
index c26cde9bf84..694b11e6460 100644
--- a/crates/workspace/src/workspace.rs
+++ b/crates/workspace/src/workspace.rs
@@ -14249,6 +14249,40 @@ mod tests {
});
}
+ #[gpui::test]
+ async fn test_clamp_panel_size_only_skips_flexible_width(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));
+
+ workspace.update_in(cx, |workspace, window, cx| {
+ let bottom_panel = cx.new(|cx| TestPanel::new_flexible(DockPosition::Bottom, 100, cx));
+ let right_panel = cx.new(|cx| TestPanel::new_flexible(DockPosition::Right, 100, cx));
+ workspace.add_panel(bottom_panel.clone(), window, cx);
+ workspace.add_panel(right_panel.clone(), window, cx);
+
+ let max_size = px(200.);
+ workspace.bottom_dock().update(cx, |dock, cx| {
+ dock.clamp_panel_size(max_size, window, cx);
+ assert_eq!(
+ dock.stored_panel_size_state(&bottom_panel)
+ .and_then(|state| state.size),
+ Some(max_size - dock::RESIZE_HANDLE_SIZE)
+ );
+ });
+ workspace.right_dock().update(cx, |dock, cx| {
+ dock.clamp_panel_size(max_size, window, cx);
+ assert_eq!(
+ dock.stored_panel_size_state(&right_panel)
+ .and_then(|state| state.size),
+ None
+ );
+ });
+ });
+ }
+
#[gpui::test]
async fn test_panel_size_state_persistence(cx: &mut gpui::TestAppContext) {
init_test(cx);