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

Git commit modal branch list (#26417)

Browse source 
Closes #26273

Release Notes:

- git: Fixes opening the branch selector in the commit modal with
cmd-option-b
- git: Truncates the branch selector in the commit modal
This commit is contained in:
Conrad Irwin 2025-03-10 22:10:52 -06:00 • committed by GitHub
parent bf11b888c3
commit c2e4fdf63d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 39 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/git_ui/src/branch_picker.rs
View file

@ -12,9 +12,7 @@ use project::git::Repository;
use std::sync::Arc;
use time::OffsetDateTime;
use time_format::format_local_timestamp;
use ui::{
prelude::*, HighlightedLabel, KeyBinding, ListItem, ListItemSpacing, PopoverMenuHandle, Tooltip,
};
use ui::{prelude::*, HighlightedLabel, KeyBinding, ListItem, ListItemSpacing, Tooltip};
use util::ResultExt;
use workspace::notifications::DetachAndPromptErr;
use workspace::{ModalView, Workspace};
@ -79,7 +77,6 @@ enum BranchListStyle {
pub struct BranchList {
width: Rems,
pub popover_handle: PopoverMenuHandle<Self>,
pub picker: Entity<Picker<BranchListDelegate>>,
_subscription: Subscription,
}
@ -92,7 +89,6 @@ impl BranchList {
window: &mut Window,
cx: &mut Context<Self>,
) -> Self {
let popover_handle = PopoverMenuHandle::default();
let all_branches_request = repository
.clone()
.map(|repository| repository.read(cx).branches());
@ -130,7 +126,6 @@ impl BranchList {
Self {
picker,
width,
popover_handle,
_subscription,
}
}