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

Automatically close terminal dock when the last terminal was closed

Browse source
This commit is contained in:
Antonio Scandurra 2023-05-09 10:17:35 +02:00
parent 916612caf1
commit 506f978c41
3 changed files with 85 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -461,7 +461,7 @@ pub struct Workspace {
leader_updates_tx: mpsc::UnboundedSender<(PeerId, proto::UpdateFollowers)>,
database_id: WorkspaceId,
app_state: Arc<AppState>,
_window_subscriptions: [Subscription; 3],
_subscriptions: Vec<Subscription>,
_apply_leader_updates: Task<Result<()>>,
_observe_current_user: Task<Result<()>>,
}
@ -592,7 +592,7 @@ impl Workspace {
active_call = Some((call, subscriptions));
}
let subscriptions = [
let subscriptions = vec![
cx.observe_fullscreen(|_, _, cx| cx.notify()),
cx.observe_window_activation(Self::on_window_activation_changed),
cx.observe_window_bounds(move |_, mut bounds, display, cx| {
@ -612,6 +612,9 @@ impl Workspace {
.spawn(DB.set_window_bounds(workspace_id, bounds, display))
.detach_and_log_err(cx);
}),
Self::register_dock(&left_dock, cx),
Self::register_dock(&bottom_dock, cx),
Self::register_dock(&right_dock, cx),
];
let mut this = Workspace {
@ -640,7 +643,7 @@ impl Workspace {
_observe_current_user,
_apply_leader_updates,
leader_updates_tx,
_window_subscriptions: subscriptions,
_subscriptions: subscriptions,
};
this.project_remote_id_changed(project.read(cx).remote_id(), cx);
cx.defer(|this, cx| this.update_window_title(cx));
@ -1316,6 +1319,26 @@ impl Workspace {
}
}
fn register_dock(dock: &ViewHandle<Dock>, cx: &mut ViewContext<Self>) -> Subscription {
cx.subscribe(dock, Self::handle_dock_event)
}
fn handle_dock_event(
&mut self,
dock: ViewHandle<Dock>,
event: &dock::Event,
cx: &mut ViewContext<Self>,
) {
match event {
dock::Event::Close => {
dock.update(cx, |dock, cx| dock.set_open(false, cx));
self.serialize_workspace(cx);
cx.focus_self();
cx.notify();
}
}
}
pub fn toggle_dock(&mut self, dock_side: DockPosition, cx: &mut ViewContext<Self>) {
let dock = match dock_side {
DockPosition::Left => &mut self.left_dock,