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

Increase trailoff limit for modal branch picker. (#2710)

Browse source 
Z-2601

Follow-up to modal branch picker, this is the updated version:

![image](https://github.com/zed-industries/zed/assets/24362066/1017e2d9-7107-4e4c-805e-bae46412079a)
Previously a trail off limit was much smaller:

![image](https://github.com/zed-industries/zed/assets/24362066/efb6c7cf-d90d-4fbc-8c28-84872f215ac5)

Release notes:
- N/A
This commit is contained in:
Piotr Osiewicz 2023-07-12 18:07:54 +02:00 • committed by GitHub
commit c12821f6c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/vcs_menu/src/lib.rs
View file

@ -24,6 +24,7 @@ pub fn build_branch_list(
workspace, workspace,
selected_index: 0, selected_index: 0,
last_query: String::default(), last_query: String::default(),
branch_name_trailoff_after: 29,
}, },
cx, cx,
) )
@ -46,6 +47,8 @@ fn toggle(
workspace, workspace,
selected_index: 0, selected_index: 0,
last_query: String::default(), last_query: String::default(),
/// Modal branch picker has a longer trailoff than a popover one.
branch_name_trailoff_after: 70,
}, },
cx, cx,
) )
@ -63,6 +66,8 @@ pub struct BranchListDelegate {
workspace: ViewHandle<Workspace>, workspace: ViewHandle<Workspace>,
selected_index: usize, selected_index: usize,
last_query: String, last_query: String,
/// Max length of branch name before we truncate it and add a trailing `...`.
branch_name_trailoff_after: usize,
} }
impl PickerDelegate for BranchListDelegate { impl PickerDelegate for BranchListDelegate {
@ -213,15 +218,15 @@ impl PickerDelegate for BranchListDelegate {
selected: bool, selected: bool,
cx: &gpui::AppContext, cx: &gpui::AppContext,
) -> AnyElement<Picker<Self>> { ) -> AnyElement<Picker<Self>> {
const DISPLAYED_MATCH_LEN: usize = 29;
let theme = &theme::current(cx); let theme = &theme::current(cx);
let hit = &self.matches[ix]; let hit = &self.matches[ix];
let shortened_branch_name = util::truncate_and_trailoff(&hit.string, DISPLAYED_MATCH_LEN); let shortened_branch_name =
util::truncate_and_trailoff(&hit.string, self.branch_name_trailoff_after);
let highlights = hit let highlights = hit
.positions .positions
.iter() .iter()
.copied() .copied()
.filter(|index| index < &DISPLAYED_MATCH_LEN) .filter(|index| index < &self.branch_name_trailoff_after)
.collect(); .collect();
let style = theme.picker.item.in_state(selected).style_for(mouse_state); let style = theme.picker.item.in_state(selected).style_for(mouse_state);
Flex::row() Flex::row()