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

Dismiss Recent Projects & VCS modals on ESC (#3671)

Browse source 
Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2023-12-15 12:07:25 +01:00 • committed by GitHub
parent 83b55de73e
commit 2b3d9deabe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
crates/recent_projects2/src/recent_projects.rs
View file

@ -76,7 +76,10 @@ impl RecentProjects {
let delegate = let delegate =
RecentProjectsDelegate::new(weak_workspace, workspace_locations, true); RecentProjectsDelegate::new(weak_workspace, workspace_locations, true);
RecentProjects::new(delegate, cx) let modal = RecentProjects::new(delegate, cx);
cx.subscribe(&modal.picker, |_, _, _, cx| cx.emit(DismissEvent))
.detach();
modal
}); });
} else { } else {
workspace.show_notification(0, cx, |cx| { workspace.show_notification(0, cx, |cx| {

9
crates/vcs_menu2/src/lib.rs
View file

@ -65,8 +65,13 @@ impl ModalBranchList {
) -> Result<()> { ) -> Result<()> {
// Modal branch picker has a longer trailoff than a popover one. // Modal branch picker has a longer trailoff than a popover one.
let delegate = BranchListDelegate::new(workspace, cx.view().clone(), 70, cx)?; let delegate = BranchListDelegate::new(workspace, cx.view().clone(), 70, cx)?;
workspace.toggle_modal(cx, |cx| ModalBranchList { workspace.toggle_modal(cx, |cx| {
picker: cx.build_view(|cx| Picker::new(delegate, cx)), let modal = ModalBranchList {
picker: cx.build_view(|cx| Picker::new(delegate, cx)),
};
cx.subscribe(&modal.picker, |_, _, _, cx| cx.emit(DismissEvent))
.detach();
modal
}); });
Ok(()) Ok(())