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

Defer hiding the dock and going back/forward when Pane is on the stack

Browse source
This commit is contained in:
Antonio Scandurra 2023-05-01 17:06:05 +02:00
parent e3b2407ebf
commit 780ece551e
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/workspace/src/pane.rs
View file

@ -1645,9 +1645,11 @@ impl Pane {
cx, cx,
|this, cx| { |this, cx| {
if let Some(workspace) = this.workspace.upgrade(cx) { if let Some(workspace) = this.workspace.upgrade(cx) {
cx.window_context().defer(move |cx| {
workspace.update(cx, |workspace, cx| { workspace.update(cx, |workspace, cx| {
Dock::hide_dock(workspace, &Default::default(), cx) Dock::hide_dock(workspace, &Default::default(), cx)
}) })
});
} }
}, },
None, None,

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

@ -138,10 +138,13 @@ impl View for Toolbar {
.upgrade(cx) .upgrade(cx)
.and_then(|pane| pane.read(cx).workspace().upgrade(cx)) .and_then(|pane| pane.read(cx).workspace().upgrade(cx))
{ {
let pane = pane.clone();
cx.window_context().defer(move |cx| {
workspace.update(cx, |workspace, cx| { workspace.update(cx, |workspace, cx| {
Pane::go_back(workspace, Some(pane.clone()), cx) Pane::go_back(workspace, Some(pane.clone()), cx)
.detach_and_log_err(cx); .detach_and_log_err(cx);
}); });
})
} }
} }
}, },
@ -163,10 +166,13 @@ impl View for Toolbar {
.upgrade(cx) .upgrade(cx)
.and_then(|pane| pane.read(cx).workspace().upgrade(cx)) .and_then(|pane| pane.read(cx).workspace().upgrade(cx))
{ {
let pane = pane.clone();
cx.window_context().defer(move |cx| {
workspace.update(cx, |workspace, cx| { workspace.update(cx, |workspace, cx| {
Pane::go_forward(workspace, Some(pane.clone()), cx) Pane::go_forward(workspace, Some(pane.clone()), cx)
.detach_and_log_err(cx); .detach_and_log_err(cx);
}); });
});
} }
} }
}, },