mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-13 05:42:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix context menus not cycling over its edge when selecting items (#20592)

Browse source
This commit is contained in:
Kirill Bulatov 2024-11-13 15:14:23 +01:00 committed by GitHub
parent 7e82ca8082
commit 84e47fb80b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
crates/ui/src/components/context_menu.rs
View file

@ -262,29 +262,38 @@ impl ContextMenu {
fn select_next(&mut self, _: &SelectNext, cx: &mut ViewContext<Self>) {
if let Some(ix) = self.selected_index {
for (ix, item) in self.items.iter().enumerate().skip(ix + 1) {
if item.is_selectable() {
self.selected_index = Some(ix);
cx.notify();
break;
let next_index = ix + 1;
if self.items.len() <= next_index {
self.select_first(&SelectFirst, cx);
} else {
for (ix, item) in self.items.iter().enumerate().skip(next_index) {
if item.is_selectable() {
self.selected_index = Some(ix);
cx.notify();
break;
}
}
}
} else {
self.select_first(&Default::default(), cx);
self.select_first(&SelectFirst, cx);
}
}
pub fn select_prev(&mut self, _: &SelectPrev, cx: &mut ViewContext<Self>) {
if let Some(ix) = self.selected_index {
for (ix, item) in self.items.iter().enumerate().take(ix).rev() {
if item.is_selectable() {
self.selected_index = Some(ix);
cx.notify();
break;
if ix == 0 {
self.handle_select_last(&SelectLast, cx);
} else {
for (ix, item) in self.items.iter().enumerate().take(ix).rev() {
if item.is_selectable() {
self.selected_index = Some(ix);
cx.notify();
break;
}
}
}
} else {
self.handle_select_last(&Default::default(), cx);
self.handle_select_last(&SelectLast, cx);
}
}