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

Use proper context to show terminal split menu bindings (#21253)

Browse source 
Follow-up of https://github.com/zed-industries/zed/pull/21251

Show proper keybindings on the terminal split button:

<img width="249" alt="image"
src="https://github.com/user-attachments/assets/b51b183f-788a-4e8f-9fec-3ec07f084bd4">

Release Notes:

- N/A
This commit is contained in:
Kirill Bulatov 2024-11-28 00:06:23 +02:00 • committed by GitHub
parent 34ed48e14b
commit e803815b16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
crates/terminal_view/src/terminal_panel.rs
View file

@ -26,8 +26,8 @@ use terminal::{
Terminal, Terminal,
}; };
use ui::{ use ui::{
div, h_flex, ButtonCommon, Clickable, ContextMenu, IconButton, IconSize, InteractiveElement, div, h_flex, ButtonCommon, Clickable, ContextMenu, FluentBuilder, IconButton, IconSize,
PopoverMenu, Selectable, Tooltip, InteractiveElement, PopoverMenu, Selectable, Tooltip,
}; };
use util::{ResultExt, TryFutureExt}; use util::{ResultExt, TryFutureExt};
use workspace::{ use workspace::{
@ -130,6 +130,10 @@ impl TerminalPanel {
let assistant_tab_bar_button = self.assistant_tab_bar_button.clone(); let assistant_tab_bar_button = self.assistant_tab_bar_button.clone();
terminal_pane.update(cx, |pane, cx| { terminal_pane.update(cx, |pane, cx| {
pane.set_render_tab_bar_buttons(cx, move |pane, cx| { pane.set_render_tab_bar_buttons(cx, move |pane, cx| {
let split_context = pane
.items()
.find_map(|item| item.downcast::<TerminalView>())
.map(|terminal_view| terminal_view.read(cx).focus_handle.clone());
if !pane.has_focus(cx) && !pane.context_menu_focused(cx) { if !pane.has_focus(cx) && !pane.context_menu_focused(cx) {
return (None, None); return (None, None);
} }
@ -175,14 +179,21 @@ impl TerminalPanel {
) )
.anchor(AnchorCorner::TopRight) .anchor(AnchorCorner::TopRight)
.with_handle(pane.split_item_context_menu_handle.clone()) .with_handle(pane.split_item_context_menu_handle.clone())
.menu(move |cx| { .menu({
ContextMenu::build(cx, |menu, _| { let split_context = split_context.clone();
menu.action("Split Right", SplitRight.boxed_clone()) move |cx| {
ContextMenu::build(cx, |menu, _| {
menu.when_some(
split_context.clone(),
|menu, split_context| menu.context(split_context),
)
.action("Split Right", SplitRight.boxed_clone())
.action("Split Left", SplitLeft.boxed_clone()) .action("Split Left", SplitLeft.boxed_clone())
.action("Split Up", SplitUp.boxed_clone()) .action("Split Up", SplitUp.boxed_clone())
.action("Split Down", SplitDown.boxed_clone()) .action("Split Down", SplitDown.boxed_clone())
}) })
.into() .into()
}
}), }),
) )
.child({ .child({