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

Fix left clicking the close button in the switcher (#25979)

Browse source 
The close button on each tab previously only worked when you right
clicked it, presumably because on macos people were using `ctrl+tab` to
open the picker, and clicking with `ctrl` held registers as a right
click. Now it should work with either mouse button.

Release Notes:

- N/A

Co-authored-by: Conrad <conrad@zed.dev>
This commit is contained in:
Julia Ryan 2025-03-05 11:50:39 -08:00 • committed by GitHub
parent 7c39153160
commit f13b2fd811
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/tab_switcher/src/tab_switcher.rs
View file

@ -436,11 +436,10 @@ impl PickerDelegate for TabSwitcherDelegate {
.child(div().w_2())
.into_any_element();
let close_button = div()
// We need this on_mouse_up here instead of on_click on the close
// button because Picker intercepts the same events and handles them
// as click's on list items.
// See the same handler in Picker for more details.
.id("close-button")
.on_mouse_up(
// We need this on_mouse_up here because on macOS you may have ctrl held
// down to open the menu, and a ctrl-click comes through as a right click.
MouseButton::Right,
cx.listener(move |picker, _: &MouseUpEvent, window, cx| {
cx.stop_propagation();
@ -451,7 +450,11 @@ impl PickerDelegate for TabSwitcherDelegate {
IconButton::new("close_tab", IconName::Close)
.icon_size(IconSize::Small)
.icon_color(indicator_color)
.tooltip(Tooltip::text("Close")),
.tooltip(Tooltip::text("Close"))
.on_click(cx.listener(move |picker, _, window, cx| {
cx.stop_propagation();
picker.delegate.close_item_at(ix, window, cx);
})),
)
.into_any_element();