Skip to content

terminal_view: Ensure terminal toggle shortcut appears in tooltip#52357

Merged
ConradIrwin merged 1 commit intozed-industries:mainfrom
msmolkin:fix-terminal-toggle
Mar 24, 2026
Merged

terminal_view: Ensure terminal toggle shortcut appears in tooltip#52357
ConradIrwin merged 1 commit intozed-industries:mainfrom
msmolkin:fix-terminal-toggle

Conversation

@msmolkin
Copy link
Copy Markdown
Contributor

@msmolkin msmolkin commented Mar 24, 2026

Follow-up to the discussion in #51670.

@ConradIrwin, thanks for the review!

You're right about the other editors. VS Code and JetBrains use dedicated shortcuts for bottom panel tabs, which exactly mirrors how `ctrl-`` already behaves in Zed, so we don't need a new keybinding.

The reason I originally proposed cmd-shift-j was just to match the UI pattern of the Debugger, which clearly shows cmd-shift-d on hover. Because of a minor UI discoverability bug, the Terminal button's tooltip was completely blank, which made it look like it just lacked a shortcut entirely.

It turns out the Terminal button's internal toggle_action() method was just telling the UI to look up ToggleFocus instead of terminal_panel::Toggle (which is what `ctrl-`` is actually bound to).

I've updated this branch with a simple one-word fix that just points the toggle_action to the correct keymap. The existing `ctrl-`` shortcut now shows up perfectly in the hover tooltip. Good catch on the existing shortcuts, keeps this much cleaner.

Release Notes:

  • Fixed the tooltip on the terminal dock icon

@cla-bot cla-bot Bot added the cla-signed The user has signed the Contributor License Agreement label Mar 24, 2026
@maxdeviant maxdeviant changed the title fix(ui): Ensure terminal toggle shortcut appears in tooltip terminal_view: Ensure terminal toggle shortcut appears in tooltip Mar 24, 2026
@ConradIrwin ConradIrwin enabled auto-merge (squash) March 24, 2026 22:13
@zed-community-bot zed-community-bot Bot added the first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions label Mar 24, 2026
@zed-codeowner-coordinator zed-codeowner-coordinator Bot requested review from a team, Veykril and kubkon and removed request for a team March 24, 2026 22:13
@ConradIrwin
Copy link
Copy Markdown
Member

Amazing, thank you for the investigation and taking the time to fix it.

@ConradIrwin ConradIrwin merged commit 64d4e01 into zed-industries:main Mar 24, 2026
36 checks passed
piper-of-dawn pushed a commit to piper-of-dawn/zed that referenced this pull request Apr 25, 2026
…d-industries#52357)

Follow-up to the discussion in zed-industries#51670.

@ConradIrwin, thanks for the review!

You're right about the other editors. VS Code and JetBrains use
dedicated shortcuts for bottom panel tabs, which exactly mirrors how
`ctrl-`` already behaves in Zed, so we don't need a new keybinding.

The reason I originally proposed `cmd-shift-j` was just to match the UI
pattern of the Debugger, which clearly shows `cmd-shift-d` on hover.
Because of a minor UI discoverability bug, the Terminal button's tooltip
was completely blank, which made it look like it just lacked a shortcut
entirely.

It turns out the Terminal button's internal `toggle_action()` method was
just telling the UI to look up `ToggleFocus` instead of
`terminal_panel::Toggle` (which is what `ctrl-`` is actually bound to).

I've updated this branch with a simple one-word fix that just points the
`toggle_action` to the correct keymap. The existing `ctrl-`` shortcut
now shows up perfectly in the hover tooltip. Good catch on the existing
shortcuts, keeps this much cleaner.

Co-authored-by: Michael Smolkin <msmolkin@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement first contribution the author's first pull request to Zed. NOTE: the label application is automated via github actions

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants