zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-05 06:49:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Ensure ctrl-` works in the terminal panel

Browse Source
This commit is contained in:
Antonio Scandurra 2023-05-09 17:38:18 +02:00
parent 634b699281
commit 641f5d1107
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/terminal_view/src/terminal_panel.rs
View File

@ -8,6 +8,10 @@ use settings::{Settings, WorkingDirectory};
use util::ResultExt;
use workspace::{dock::Panel, pane, DraggedItem, Pane, Workspace};
pub fn init(cx: &mut AppContext) {
cx.add_action(TerminalPanel::add_terminal);
}
pub enum Event {
Close,
}
@ -47,7 +51,9 @@ impl TerminalPanel {
let this = this.clone();
cx.window_context().defer(move |cx| {
if let Some(this) = this.upgrade(cx) {
this.update(cx, |this, cx| this.add_terminal(cx));
this.update(cx, |this, cx| {
this.add_terminal(&Default::default(), cx);
});
}
})
},
@ -80,7 +86,7 @@ impl TerminalPanel {
}
}
fn add_terminal(&mut self, cx: &mut ViewContext<Self>) {
fn add_terminal(&mut self, _: &workspace::NewTerminal, cx: &mut ViewContext<Self>) {
if let Some(workspace) = self.workspace.upgrade(cx) {
let working_directory_strategy = cx
.global::<Settings>()
@ -123,7 +129,7 @@ impl View for TerminalPanel {
fn focus_in(&mut self, _: gpui::AnyViewHandle, cx: &mut ViewContext<Self>) {
if self.pane.read(cx).items_len() == 0 {
self.add_terminal(cx)
self.add_terminal(&Default::default(), cx)
}
}
}

1
crates/terminal_view/src/terminal_view.rs
View File

@ -64,6 +64,7 @@ actions!(
impl_actions!(terminal, [SendText, SendKeystroke]);
pub fn init(cx: &mut AppContext) {
terminal_panel::init(cx);
cx.add_action(TerminalView::deploy);
register_deserializable_item::<TerminalView>(cx);