zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-09-20 02:47:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Activate terminal button when a terminal is focus

Browse Source 
This is code I brought over from https://github.com/zed-industries/zed/pull/2267 by @mikayla-maki after fixing the conflicts.

Co-Authored-By: Mikayla Maki <mikayla.c.maki@gmail.com>
This commit is contained in:
Petros Amoiridis 2023-03-11 16:45:28 +02:00
parent bccc34c61a
commit 8440a98850
No known key found for this signature in database
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/terminal_view/src/terminal_button.rs
View File

@ -47,6 +47,13 @@ impl View for TerminalButton {
Some(workspace) => workspace.read(cx).project().read(cx),
None => return Empty::new().boxed(),
};
let focused_view = cx.focused_view_id(cx.window_id());
// FIXME: Don't hardcode "Terminal" in here
let active = focused_view
.map(|view| cx.view_ui_name(cx.window_id(), view) == Some("Terminal"))
.unwrap_or(false);
let has_terminals = !project.local_terminal_handles().is_empty();
let theme = cx.global::<Settings>().theme.clone();
@ -60,7 +67,7 @@ impl View for TerminalButton {
.status_bar
.sidebar_buttons
.item
.style_for(state, false);
.style_for(state, active);
Svg::new("icons/terminal_12.svg")
.with_color(style.icon_color)
@ -79,7 +86,9 @@ impl View for TerminalButton {
position: e.region.upper_right(),
});
} else {
cx.dispatch_action(FocusDock);
if !active {
cx.dispatch_action(FocusDock);
}
};
})
.with_tooltip::<Self, _>(
@ -160,5 +169,7 @@ impl TerminalButton {
}
impl StatusItemView for TerminalButton {
fn set_active_pane_item(&mut self, _: Option<&dyn ItemHandle>, _: &mut ViewContext<Self>) {}
fn set_active_pane_item(&mut self, _: Option<&dyn ItemHandle>, cx: &mut ViewContext<Self>) {
cx.notify();
}
}