Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
picker: Automatically switch layout depending on window dimensions (#60559)
Zephiris Evergreen01f915d6be2b
diff --git a/crates/picker/src/footer.rs b/crates/picker/src/footer.rsindex ff0b11caa94..a91ec6b5b4e 100644--- a/crates/picker/src/footer.rs+++ b/crates/picker/src/footer.rs@@ -123,7 +123,7 @@ impl<D: PickerDelegate> Picker<D> {fn render_preview_controls(&self,- _window: &mut Window,+ window: &mut Window,cx: &mut Context<Self>,) -> impl IntoElement {let focus_handle = self.focus_handle(cx);@@ -132,6 +132,12 @@ impl<D: PickerDelegate> Picker<D> {let current = self.preview_layout().unwrap_or(preview::Layout::Hidden);let preview_visible = current != preview::Layout::Hidden;+ let diff_split = if self.is_auto_vertical(window) {+ IconName::DiffSplitAuto+ } else {+ IconName::DiffSplit+ };+h_flex().child(Button::new("picker-preview-toggle", "Preview")@@ -147,35 +153,35 @@ impl<D: PickerDelegate> Picker<D> {.when(preview_visible, |this| {this.child(Divider::vertical().mx_1()).child(- IconButton::new("picker-preview-right", IconName::DiffSplit)+ IconButton::new("picker-preview-below", IconName::DiffUnified).icon_size(IconSize::Small)- .toggle_state(current == preview::Layout::Right)+ .toggle_state(current == preview::Layout::Below).tooltip(move |_window, cx| {Tooltip::for_action_in(- "Preview to the Right",- &SetPreviewRight,- &right_focus_handle,+ "Preview Below",+ &SetPreviewBelow,+ &below_focus_handle,cx,)}).on_click(cx.listener(|this, _, window, cx| {- this.set_preview_layout(preview::Layout::Right, window, cx)+ this.set_preview_layout(preview::Layout::Below, window, cx)})),).child(- IconButton::new("picker-preview-below", IconName::DiffUnified)+ IconButton::new("picker-preview-right", diff_split).icon_size(IconSize::Small)- .toggle_state(current == preview::Layout::Below)+ .toggle_state(current == preview::Layout::Right).tooltip(move |_window, cx| {Tooltip::for_action_in(- "Preview Below",- &SetPreviewBelow,- &below_focus_handle,+ "Preview to the Right",+ &SetPreviewRight,+ &right_focus_handle,cx,)}).on_click(cx.listener(|this, _, window, cx| {- this.set_preview_layout(preview::Layout::Below, window, cx)+ this.set_preview_layout(preview::Layout::Right, window, cx)})),)})diff --git a/crates/picker/src/picker.rs b/crates/picker/src/picker.rsindex 7915e6fd001..c74e78f1e84 100644--- a/crates/picker/src/picker.rs+++ b/crates/picker/src/picker.rs@@ -1280,10 +1280,34 @@ impl<D: PickerDelegate> Picker<D> {fn preview_layout(&self) -> Option<preview::Layout> {self.preview.as_ref().map(|p| p.layout)}+ fn is_auto_vertical(&self, window: &Window) -> bool {+ self.preview_layout() == Some(preview::Layout::Right)+ && self+ .size_bounds+ .would_clamp_width_if_horizontal(&self.shape, window)+ }+ /// To check whether we're rendering vertically instead of+ /// horizontally due to the auto override+ fn preview_layout_rendered(&self, window: &Window) -> Option<preview::Layout> {+ let would_clamp = matches!(+ self.preview,+ Some(Preview {+ layout: preview::Layout::Right,+ ..+ })+ ) && self.is_auto_vertical(window);+ if would_clamp {+ Some(preview::Layout::Below)+ } else {+ self.preview_layout()+ }+ }#[cfg(any(test, feature = "test-support"))]pub fn results_width(&self, window: &Window) -> gpui::Pixels {- let layout = self.preview_layout().unwrap_or(preview::Layout::Hidden);+ let layout = self+ .preview_layout_rendered(window)+ .unwrap_or(preview::Layout::Hidden);let pos = self.shape.results_position_and_size(layout, &self.size_bounds, window);diff --git a/crates/picker/src/render.rs b/crates/picker/src/render.rsindex 4ff7c425622..e60b46469c8 100644--- a/crates/picker/src/render.rs+++ b/crates/picker/src/render.rs@@ -22,7 +22,9 @@ pub mod window_controls;impl<D: PickerDelegate> Render for Picker<D> {fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {self.finish_any_completed_resize(window, cx);-+ // toggle between BelowForced and Right based on whether it'd clamp if+ // horizontal+ let rendered_layout = self.preview_layout_rendered(window);let content = match &self.preview {Some(preview @ Preview {@@ -32,6 +34,15 @@ impl<D: PickerDelegate> Render for Picker<D> {) => self.render_with_preview_below(preview, window, cx).into_any_element(),+ // render sideways based on bounds+ Some(+ preview @ Preview {+ layout: Layout::Right,+ ..+ },+ ) if rendered_layout == Some(Layout::Below) => self+ .render_with_preview_below(preview, window, cx)+ .into_any_element(),Some(preview @ Preview {layout: Layout::Right,@@ -58,7 +69,9 @@ impl<D: PickerDelegate> Render for Picker<D> {.when(has_preview, |this| this.overflow_hidden()).child(content);- let layout = self.preview_layout().unwrap_or(Layout::Hidden);+ let layout = self+ .preview_layout_rendered(window)+ .unwrap_or(Layout::Hidden);div().relative()@@ -101,7 +114,7 @@ impl<D: PickerDelegate> Picker<D> {.relative().map(|this| {self.shape.apply_results_size(- self.preview_layout(),+ self.preview_layout_rendered(window),&self.size_bounds,self.fill_height(),this,@@ -309,7 +322,11 @@ impl<D: PickerDelegate> Picker<D> {),).when(self.is_resizable(), |this| {- this.child(self.render_resize(window_controls::Middle(preview.layout), window, cx))+ this.child(self.render_resize(+ window_controls::Middle(preview::Layout::Below),+ window,+ cx,+ ))})}@@ -365,7 +382,8 @@ impl<D: PickerDelegate> Picker<D> {if let Shape::Resizing(pos) = self.shape&& !cx.has_active_drag(){- let centered = Shape::centered_and_relative(pos, self.preview_layout(), window);+ let centered =+ Shape::centered_and_relative(pos, self.preview_layout_rendered(window), window);persistence::store_shape_for_this_layout(D::name(),self.preview_layout(),diff --git a/crates/picker/src/render/window_controls.rs b/crates/picker/src/render/window_controls.rsindex a604a600e1f..cc7fbf2dc7c 100644--- a/crates/picker/src/render/window_controls.rs+++ b/crates/picker/src/render/window_controls.rs@@ -438,7 +438,7 @@ impl<D: PickerDelegate> Picker<D> {side.position(this,self.shape.clamped_position_and_size(- self.preview_layout(),+ self.preview_layout_rendered(window),&self.size_bounds,window,),@@ -451,7 +451,7 @@ impl<D: PickerDelegate> Picker<D> {ResizeDrag::<S>::start_new(self.shape,&self.size_bounds,- self.preview_layout(),+ self.preview_layout_rendered(window),window,),|_, _, _, cx| cx.new(|_| DragPreview),@@ -464,7 +464,7 @@ impl<D: PickerDelegate> Picker<D> {side.clamp(&mut working,&this.size_bounds,- this.preview_layout(),+ this.preview_layout_rendered(window),window,);this.shape = Shape::Resizing(working);@@ -487,9 +487,11 @@ impl<D: PickerDelegate> Picker<D> {return;}side.revert_to_default_size(&mut self.shape, &self.default_shape, window);- let pos =- self.shape- .clamped_position_and_size(self.preview_layout(), &self.size_bounds, window);+ let pos = self.shape.clamped_position_and_size(+ self.preview_layout_rendered(window),+ &self.size_bounds,+ window,+ );self.shape = Shape::Resizing(pos);cx.notify();}diff --git a/crates/picker/src/shape.rs b/crates/picker/src/shape.rsindex d37e2b0aae5..217ff6a8fc5 100644--- a/crates/picker/src/shape.rs+++ b/crates/picker/src/shape.rs@@ -20,6 +20,12 @@ pub(crate) struct PositionAndShape {pub(crate) preview: Pixels,}+impl PositionAndShape {+ pub(crate) fn width(&self) -> Pixels {+ self.right - self.left+ }+}+macro_rules! relative_size {($name:ident, $accessor:ident) => {/// Size type that is the sum of a relative size to the viewport and a@@ -379,6 +385,16 @@ impl SizeBounds {working.preview = working.preview.clamp(min_preview, max_preview);}+ pub(crate) fn would_clamp_width_if_horizontal(&self, shape: &Shape, window: &Window) -> bool {+ let min_width = self.min_width(Some(Layout::Right), window);++ let unbounded_width = shape+ .picker_position_and_size(Some(Layout::Right), window)+ .width();++ unbounded_width <= min_width+ }+/// Clamps a whole picker rect (results + preview) into bounds: the total size/// against the per-layout min/max, then the divider so both panes keep their/// minimums. Width is clamped about its center, height anchored at the top.