mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-06 02:37:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Always prevent window from closing and manually invoke Workspace::close

Browse source 
This ensures we ask the user to save their state if there are unsaved
changes.
This commit is contained in:
Antonio Scandurra 2022-06-23 11:44:14 +02:00
parent 06033d7fa9
commit d9b5357234
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/workspace/src/workspace.rs
View file

@ -907,7 +907,11 @@ impl Workspace {
}
}
fn close(&mut self, _: &CloseWindow, cx: &mut ViewContext<Self>) -> Option<Task<Result<()>>> {
pub fn close(
&mut self,
_: &CloseWindow,
cx: &mut ViewContext<Self>,
) -> Option<Task<Result<()>>> {
let prepare = self.prepare_to_close(cx);
Some(cx.spawn(|this, mut cx| async move {
if prepare.await? {

7
crates/zed/src/zed.rs
View file

@ -222,6 +222,13 @@ pub fn initialize_workspace(
});
auto_update::notify_of_any_new_update(cx.weak_handle(), cx);
cx.on_window_should_close(|workspace, cx| {
if let Some(task) = workspace.close(&Default::default(), cx) {
task.detach_and_log_err(cx);
}
false
});
}
pub fn build_window_options() -> WindowOptions<'static> {