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

Finally finished merging this massive ball of changes

Browse source
This commit is contained in:
Mikayla Maki 2022-07-18 16:47:42 -07:00
parent 150d2ff53f
commit 4f7b6b8b22
4 changed files with 227 additions and 223 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/terminal/src/terminal.rs
View file

@ -258,20 +258,19 @@ impl Item for TerminalView {
tab_theme: &theme::Tab,
cx: &gpui::AppContext,
) -> ElementBox {
let mut flex = Flex::row();
let title = match self.connection.read(cx) {
TerminalConnection::Connected(conn) => conn.title,
TerminalConnection::Connected(conn) => conn.title.clone(),
TerminalConnection::Disconnected { .. } => "Terminal".to_string(), //TODO ask nate about htis
};
flex.with_child(
Label::new(title, tab_theme.label.clone())
.aligned()
.contained()
.boxed(),
)
.boxed()
Flex::row()
.with_child(
Label::new(title, tab_theme.label.clone())
.aligned()
.contained()
.boxed(),
)
.boxed()
}
fn clone_on_split(&self, cx: &mut ViewContext<Self>) -> Option<Self> {
@ -283,7 +282,7 @@ impl Item for TerminalView {
.connection
.read(cx)
.get_terminal()
.and_then(|term| term.associated_directory)
.and_then(|term| term.associated_directory.clone())
.clone();
Some(TerminalView::new(wd, false, cx))