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.

thread_view: Fix overflow of placeholder text and message editor controls (#61395)

Yifeng Xu613777018f5b
diff --git a/crates/agent_ui/src/config_options.rs b/crates/agent_ui/src/config_options.rs
index ccb821f9b2d..cbefa713c2b 100644
--- a/crates/agent_ui/src/config_options.rs
+++ b/crates/agent_ui/src/config_options.rs
@@ -279,6 +279,8 @@ impl Render for ConfigOptionsView {
}
h_flex()
+ .min_w_0()
+ .flex_wrap()
.gap_1()
.children(self.selectors.iter().cloned())
.into_any_element()
diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rs
index bd50d645049..e4e7daa267d 100644
--- a/crates/agent_ui/src/conversation_view/thread_view.rs
+++ b/crates/agent_ui/src/conversation_view/thread_view.rs
@@ -4298,6 +4298,7 @@ impl ThreadView {
v_flex()
.when_some(max_content_width, |this, max_w| this.flex_basis(max_w))
.when(max_content_width.is_none(), |this| this.w_full())
+ .min_w_0()
.when(fills_container, |this| this.h_full())
.px_2()
.flex_shrink_1()
@@ -4349,11 +4350,14 @@ impl ThreadView {
.child(
h_flex()
.w_full()
+ .min_w_0()
.flex_none()
.flex_wrap()
.justify_between()
.child(
h_flex()
+ .min_w_0()
+ .flex_wrap()
.gap_0p5()
.child(self.render_add_context_button(cx))
.child(self.render_follow_toggle(cx))
@@ -4362,6 +4366,7 @@ impl ThreadView {
)
.child(
h_flex()
+ .min_w_0()
.flex_wrap()
.gap_1()
.children(self.render_token_usage(cx))