Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
agent_ui: Fix agent terminal scrollbar placement and radius (#65358)
Chris Drackettd3267a39ff90
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rsindex e0ce09bb64a..6295fbf96b6 100644--- a/crates/agent_ui/src/conversation_view/thread_view.rs+++ b/crates/agent_ui/src/conversation_view/thread_view.rs@@ -1,6 +1,7 @@use crate::{DEFAULT_THREAD_TITLE, SelectPermissionGranularity,conversation_view::thread_search_bar::{ThreadSearchBar, ThreadSearchBarEvent},+ entry_view_state::TERMINAL_CONTENT_TOP_PADDING,open_abs_path_at_point, project_path_for_file_link,thread_metadata_store::{ThreadId, ThreadMetadataStore},};@@ -8649,11 +8650,9 @@ impl ThreadView {.when(is_expanded && terminal_view.is_some(), |this| {this.child(div()- .pt_2().border_t_1().when(tool_failed || command_failed, |card| card.border_dashed()).border_color(border_color)- .bg(cx.theme().colors().terminal_background).rounded_b_md().text_ui_sm(cx).h_full()@@ -8663,7 +8662,10 @@ impl ThreadView {.content_mode(window, cx).is_scrollable(){- div().h_72().child(terminal_view).into_any_element()+ div()+ .h(rems(18. + TERMINAL_CONTENT_TOP_PADDING))+ .child(terminal_view)+ .into_any_element()} else {terminal_view.into_any_element()};diff --git a/crates/agent_ui/src/entry_view_state.rs b/crates/agent_ui/src/entry_view_state.rsindex 92158c97429..28c3cc2f4bf 100644--- a/crates/agent_ui/src/entry_view_state.rs+++ b/crates/agent_ui/src/entry_view_state.rs@@ -25,6 +25,10 @@ use workspace::Workspace;use crate::message_editor::{MessageEditor, MessageEditorEvent, SharedSessionCapabilities};+/// Top padding, in rems, inside agent terminals. The tool card adds it to the+/// scrollable terminal's height so the number of visible rows doesn't change.+pub(crate) const TERMINAL_CONTENT_TOP_PADDING: f32 = 0.5;+/// Maps an entry index through the removal of `removed` (a contiguous range of/// entries), returning `None` if the index referred to a removed entry.fn reindex_after_removal(index: usize, removed: &Range<usize>) -> Option<usize> {@@ -739,6 +743,7 @@ fn create_terminal(cx,);+ view.set_content_top_padding(gpui::rems(TERMINAL_CONTENT_TOP_PADDING), cx);view.set_embedded_mode(Some(1000), cx);view})diff --git a/crates/terminal_view/src/terminal_element.rs b/crates/terminal_view/src/terminal_element.rsindex 1af9d06eaeb..7dc48187595 100644--- a/crates/terminal_view/src/terminal_element.rs+++ b/crates/terminal_view/src/terminal_element.rs@@ -1585,13 +1585,6 @@ impl Element for TerminalElement {let terminal_view = self.terminal_view.read(cx);let scroll_top = terminal_view.scroll_top;let mouse_input_mode = terminal_view.mouse_input_mode();- let corner_radii = terminal_view- .background_corner_radii- .unwrap_or_default()- .map(|radius| radius.to_pixels(window.rem_size()))- .clamp_radii_for_quad_size(bounds.size);-- window.paint_quad(fill(bounds, layout.background_color).corner_radii(corner_radii));let origin = layout.dimensions.bounds.origin - GpuiPoint::new(px(0.), scroll_top);let scale_factor = window.scale_factor();diff --git a/crates/terminal_view/src/terminal_view.rs b/crates/terminal_view/src/terminal_view.rsindex c821c4b0f3f..0cd612f809c 100644--- a/crates/terminal_view/src/terminal_view.rs+++ b/crates/terminal_view/src/terminal_view.rs@@ -146,6 +146,7 @@ pub struct TerminalView {/// background paints over the container's corners. Only the background is/// rounded, terminal content isn't clipped.background_corner_radii: Option<Corners<Rems>>,+ content_top_padding: Rems,read_only: bool,// Explicit override for whether workspace-specific context menu actions are shown.// When `None`, visibility is derived from `mode` (hidden for embedded terminals).@@ -300,6 +301,7 @@ impl TerminalView {hover_tooltip_update: Task::ready(()),mode: TerminalMode::Standalone,background_corner_radii: None,+ content_top_padding: Rems::ZERO,read_only: false,show_workspace_actions: None,workspace_id,@@ -340,6 +342,26 @@ impl TerminalView {cx.notify();}+ pub fn set_content_top_padding(&mut self, padding: Rems, cx: &mut Context<Self>) {+ self.content_top_padding = padding;+ cx.notify();+ }++ fn content_background_corner_radii(+ &self,+ content_mode: &ContentMode,+ cx: &App,+ ) -> Corners<Rems> {+ let mut radii = self.background_corner_radii.unwrap_or_default();+ if content_mode.is_scrollable()+ && TerminalScrollbarSettingsWrapper.visibility(cx) != scrollbars::ShowScrollbar::Never+ {+ radii.top_right = Rems::ZERO;+ radii.bottom_right = Rems::ZERO;+ }+ radii+ }+pub fn is_read_only(&self) -> bool {self.read_only}@@ -1439,6 +1461,8 @@ impl Render for TerminalView {let terminal_view_handle = cx.entity();let focused = self.focus_handle.is_focused(window);+ let content_mode = self.content_mode(window, cx);+ let content_corner_radii = self.content_background_corner_radii(&content_mode, cx);div().id("terminal-view")@@ -1505,17 +1529,27 @@ impl Render for TerminalView {.rounded_bl(radii.bottom_left).rounded_br(radii.bottom_right)})- .child(TerminalElement::new(- terminal_handle,- terminal_view_handle,- self.workspace.clone(),- self.focus_handle.clone(),- focused,- self.should_show_cursor(focused, cx),- self.block_below_cursor.clone(),- self.mode.clone(),- ))- .when(self.content_mode(window, cx).is_scrollable(), |div| {+ .child(+ div()+ .size_full()+ .pt(self.content_top_padding)+ .bg(cx.theme().colors().terminal_background)+ .rounded_tl(content_corner_radii.top_left)+ .rounded_tr(content_corner_radii.top_right)+ .rounded_bl(content_corner_radii.bottom_left)+ .rounded_br(content_corner_radii.bottom_right)+ .child(TerminalElement::new(+ terminal_handle,+ terminal_view_handle,+ self.workspace.clone(),+ self.focus_handle.clone(),+ focused,+ self.should_show_cursor(focused, cx),+ self.block_below_cursor.clone(),+ self.mode.clone(),+ )),+ )+ .when(content_mode.is_scrollable(), |div| {let colors = cx.theme().colors();div.custom_scrollbars(Scrollbars::for_settings::<TerminalScrollbarSettingsWrapper>()