oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

terminal_view: Fix close tab button tooltip showing wrong keybinding on windows (#43981)

Browse Source 
Closes https://github.com/zed-industries/zed/issues/43882

Release Notes:

- Fixed wrong button tooltips being shown for terminal pane on windows
This commit is contained in:
Lukas Wirth
2025-12-02 11:33:00 +00:00
committed by GitHub
parent 0df86e406a
commit 6a097298b0
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/workspace/src/pane.rs
+17 -5
View File
@@ -2724,11 +2724,11 @@ impl Pane {
.map(|this| {
if is_active {
let focus_handle = focus_handle.clone();
this.tooltip(move |_window, cx| {
this.tooltip(move |window, cx| {
Tooltip::for_action_in(
end_slot_tooltip_text,
end_slot_action,
&focus_handle,
&window.focused(cx).unwrap_or_else(|| focus_handle.clone()),
cx,
)
})
@@ -3031,7 +3031,14 @@ impl Pane {
.disabled(!self.can_navigate_backward())
.tooltip({
let focus_handle = focus_handle.clone();
move |_window, cx| Tooltip::for_action_in("Go Back", &GoBack, &focus_handle, cx)
move |window, cx| {
Tooltip::for_action_in(
"Go Back",
&GoBack,
&window.focused(cx).unwrap_or_else(|| focus_handle.clone()),
cx,
)
}
});
let navigate_forward = IconButton::new("navigate_forward", IconName::ArrowRight)
@@ -3047,8 +3054,13 @@ impl Pane {
.disabled(!self.can_navigate_forward())
.tooltip({
let focus_handle = focus_handle.clone();
move |_window, cx| {
Tooltip::for_action_in("Go Forward", &GoForward, &focus_handle, cx)
move |window, cx| {
Tooltip::for_action_in(
"Go Forward",
&GoForward,
&window.focused(cx).unwrap_or_else(|| focus_handle.clone()),
cx,
)
}
});