zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Wrap over picker's matches when reaching the end of the list

Browse Source
This commit is contained in:
Kirill Bulatov 2024-01-18 16:54:35 +02:00
parent 5d6af532d9
commit 36ed5a31df
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/picker/src/picker.rs
View File

@ -4,7 +4,7 @@ use gpui::{
FocusableView, Length, MouseButton, MouseDownEvent, Render, Task, UniformListScrollHandle, FocusableView, Length, MouseButton, MouseDownEvent, Render, Task, UniformListScrollHandle,
View, ViewContext, WindowContext, View, ViewContext, WindowContext,
}; };
use std::{cmp, sync::Arc}; use std::sync::Arc;
use ui::{prelude::*, v_flex, Color, Divider, Label, ListItem, ListItemSpacing, ListSeparator}; use ui::{prelude::*, v_flex, Color, Divider, Label, ListItem, ListItemSpacing, ListSeparator};
use workspace::ModalView; use workspace::ModalView;
@ -103,7 +103,7 @@ impl<D: PickerDelegate> Picker<D> {
let count = self.delegate.match_count(); let count = self.delegate.match_count();
if count > 0 { if count > 0 {
let index = self.delegate.selected_index(); let index = self.delegate.selected_index();
let ix = cmp::min(index + 1, count - 1); let ix = if index == count - 1 { 0 } else { index + 1 };
self.delegate.set_selected_index(ix, cx); self.delegate.set_selected_index(ix, cx);
self.scroll_handle.scroll_to_item(ix); self.scroll_handle.scroll_to_item(ix);
cx.notify(); cx.notify();
@ -114,7 +114,7 @@ impl<D: PickerDelegate> Picker<D> {
let count = self.delegate.match_count(); let count = self.delegate.match_count();
if count > 0 { if count > 0 {
let index = self.delegate.selected_index(); let index = self.delegate.selected_index();
let ix = index.saturating_sub(1); let ix = if index == 0 { count - 1 } else { index - 1 };
self.delegate.set_selected_index(ix, cx); self.delegate.set_selected_index(ix, cx);
self.scroll_handle.scroll_to_item(ix); self.scroll_handle.scroll_to_item(ix);
cx.notify(); cx.notify();