vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

settings_ui: Fix file header from showing duplicate display names (#40943)

Browse source 
After clicking on the file drop-down and selecting a file, both the
selected file and the first drop-down entry would be the same file name
instead of overwriting a file name.

Release Notes:

- settings ui: Fix bug where duplicate file names showed in the header
files
This commit is contained in:
Anthony Eid 2025-10-22 18:33:45 -04:00 committed by GitHub
parent 731237222e
commit ca4103246f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crates/settings_ui/src/settings_ui.rs
View file

@ -1702,7 +1702,7 @@ impl SettingsWindow {
.iter()
.any(|(file, _)| file == &self.current_file);
if !current_file_still_exists {
self.change_file(0, window, false, cx);
self.change_file(0, false, window, cx);
}
}
@ -1735,8 +1735,8 @@ impl SettingsWindow {
fn change_file(
&mut self,
ix: usize,
window: &mut Window,
drop_down_file: bool,
window: &mut Window,
cx: &mut Context<SettingsWindow>,
) {
if ix >= self.files.len() {
@ -1785,7 +1785,7 @@ impl SettingsWindow {
.on_click(cx.listener({
let focus_handle = focus_handle.clone();
move |this, _: &gpui::ClickEvent, window, cx| {
this.change_file(ix, window, false, cx);
this.change_file(ix, false, window, cx);
focus_handle.focus(window);
}
}))
@ -1834,23 +1834,35 @@ impl SettingsWindow {
"more-files",
format!("+{}", self.files.len() - (OVERFLOW_LIMIT + 1)),
ContextMenu::build(window, cx, move |mut menu, _, _| {
for (ix, (file, focus_handle)) in self
for (mut ix, (file, focus_handle)) in self
.files
.iter()
.enumerate()
.skip(OVERFLOW_LIMIT + 1)
{
let (display_name, focus_handle) = if self
.drop_down_file
.is_some_and(|drop_down_ix| drop_down_ix == ix)
{
ix = OVERFLOW_LIMIT;
(
self.display_name(&self.files[ix].0),
self.files[ix].1.clone(),
)
} else {
(self.display_name(&file), focus_handle.clone())
};
menu = menu.entry(
self.display_name(file)
display_name
.expect("Files should always have a name"),
None,
{
let this = this.clone();
let focus_handle = focus_handle.clone();
move |window, cx| {
this.update(cx, |this, cx| {
this.change_file(
ix, window, true, cx,
ix, true, window, cx,
);
});
focus_handle.focus(window);