Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix AI Context menu text wrapping causing overlap (#21438)

Browse source 
Closes https://github.com/zed-industries/zed/issues/20678

| Before | After |
| --- | --- |
| <img width="672" alt="SCR-20241203-jreb"
src="https://github.com/user-attachments/assets/411ba2a6-712f-4ab7-a320-12ac9a35c1e1">
| <img width="771" alt="SCR-20241203-jwhe"
src="https://github.com/user-attachments/assets/022c8ee9-4089-4c09-aa4b-12a0f5528822">
|

Release Notes:

- Fixed AI Context menu text wrapping causing overlap.

Also cc #21409 @WeetHet @osiewicz to use `Label`, this PR has been fixed
`Label` to ensure `whitespace_nowrap` when use `single_line`.

---------

Co-authored-by: Danilo Leal <daniloleal09@gmail.com>
This commit is contained in:
Jason Lee 2024-12-03 12:45:15 +08:00 • committed by GitHub
parent 2b143784da
commit a8c7e61021
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/assistant/src/slash_command_picker.rs
View file

@ -2,7 +2,7 @@ use std::sync::Arc;
use gpui::{AnyElement, DismissEvent, SharedString, Task, WeakView}; use gpui::{AnyElement, DismissEvent, SharedString, Task, WeakView};
use picker::{Picker, PickerDelegate, PickerEditorPosition}; use picker::{Picker, PickerDelegate, PickerEditorPosition};
use ui::{prelude::*, ListItem, ListItemSpacing, PopoverMenu, PopoverTrigger}; use ui::{prelude::*, ListItem, ListItemSpacing, PopoverMenu, PopoverTrigger, Tooltip};
use crate::assistant_panel::ContextEditor; use crate::assistant_panel::ContextEditor;
use crate::SlashCommandWorkingSet; use crate::SlashCommandWorkingSet;
@ -177,11 +177,17 @@ impl PickerDelegate for SlashCommandDelegate {
.inset(true) .inset(true)
.spacing(ListItemSpacing::Dense) .spacing(ListItemSpacing::Dense)
.selected(selected) .selected(selected)
.tooltip({
let description = info.description.clone();
move |cx| cx.new_view(|_| Tooltip::new(description.clone())).into()
})
.child( .child(
v_flex() v_flex()
.group(format!("command-entry-label-{ix}")) .group(format!("command-entry-label-{ix}"))
.w_full() .w_full()
.py_0p5()
.min_w(px(250.)) .min_w(px(250.))
.max_w(px(400.))
.child( .child(
h_flex() h_flex()
.gap_1p5() .gap_1p5()
@ -192,7 +198,7 @@ impl PickerDelegate for SlashCommandDelegate {
{ {
label.push_str(&args); label.push_str(&args);
} }
Label::new(label).size(LabelSize::Small) Label::new(label).single_line().size(LabelSize::Small)
})) }))
.children(info.args.clone().filter(|_| !selected).map( .children(info.args.clone().filter(|_| !selected).map(
|args| { |args| {
@ -200,6 +206,7 @@ impl PickerDelegate for SlashCommandDelegate {
.font_buffer(cx) .font_buffer(cx)
.child( .child(
Label::new(args) Label::new(args)
.single_line()
.size(LabelSize::Small) .size(LabelSize::Small)
.color(Color::Muted), .color(Color::Muted),
) )
@ -210,9 +217,11 @@ impl PickerDelegate for SlashCommandDelegate {
)), )),
) )
.child( .child(
Label::new(info.description.clone()) div().overflow_hidden().text_ellipsis().child(
.size(LabelSize::Small) Label::new(info.description.clone())
.color(Color::Muted), .size(LabelSize::Small)
.color(Color::Muted),
),
), ),
), ),
), ),