mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-27 04:44:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Allow closing tabs with the middle mouse button

Browse source
This commit is contained in:
ForLoveOfCats 2022-07-22 00:43:50 -04:00
parent 8c1d4d877f
commit 36d789ff84
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
crates/workspace/src/pane.rs
View file

@ -13,7 +13,7 @@ use gpui::{
}, },
impl_actions, impl_internal_actions, impl_actions, impl_internal_actions,
platform::{CursorStyle, NavigationDirection}, platform::{CursorStyle, NavigationDirection},
AppContext, AsyncAppContext, Entity, ModelHandle, MouseButton, MouseButtonEvent, AppContext, AsyncAppContext, Entity, EventContext, ModelHandle, MouseButton, MouseButtonEvent,
MutableAppContext, PromptLevel, Quad, RenderContext, Task, View, ViewContext, ViewHandle, MutableAppContext, PromptLevel, Quad, RenderContext, Task, View, ViewContext, ViewHandle,
WeakViewHandle, WeakViewHandle,
}; };
@ -875,9 +875,20 @@ impl Pane {
let is_pane_active = self.is_active; let is_pane_active = self.is_active;
let mut row = Flex::row().scrollable::<Tabs, _>(1, autoscroll, cx); let mut row = Flex::row().scrollable::<Tabs, _>(1, autoscroll, cx);
for (ix, (item, detail)) in self.items.iter().zip(self.tab_details(cx)).enumerate() { for (ix, (item, detail)) in self.items.iter().zip(self.tab_details(cx)).enumerate() {
let item_id = item.id();
let detail = if detail == 0 { None } else { Some(detail) }; let detail = if detail == 0 { None } else { Some(detail) };
let is_tab_active = ix == self.active_item_index; let is_tab_active = ix == self.active_item_index;
let close_tab_callback = {
let pane = pane.clone();
move |_, cx: &mut EventContext| {
cx.dispatch_action(CloseItem {
item_id,
pane: pane.clone(),
})
}
};
row.add_child({ row.add_child({
let mut tab_style = match (is_pane_active, is_tab_active) { let mut tab_style = match (is_pane_active, is_tab_active) {
(true, true) => theme.workspace.active_pane_active_tab.clone(), (true, true) => theme.workspace.active_pane_active_tab.clone(),
@ -943,7 +954,6 @@ impl Pane {
.with_child( .with_child(
Align::new( Align::new(
ConstrainedBox::new(if mouse_state.hovered { ConstrainedBox::new(if mouse_state.hovered {
let item_id = item.id();
enum TabCloseButton {} enum TabCloseButton {}
let icon = Svg::new("icons/x_mark_thin_8.svg"); let icon = Svg::new("icons/x_mark_thin_8.svg");
MouseEventHandler::new::<TabCloseButton, _, _>( MouseEventHandler::new::<TabCloseButton, _, _>(
@ -961,15 +971,11 @@ impl Pane {
) )
.with_padding(Padding::uniform(4.)) .with_padding(Padding::uniform(4.))
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)
.on_click(MouseButton::Left, { .on_click(MouseButton::Left, close_tab_callback.clone())
let pane = pane.clone(); .on_click(
move |_, cx| { MouseButton::Middle,
cx.dispatch_action(CloseItem { close_tab_callback.clone(),
item_id, )
pane: pane.clone(),
})
}
})
.named("close-tab-icon") .named("close-tab-icon")
} else { } else {
Empty::new().boxed() Empty::new().boxed()
@ -992,6 +998,7 @@ impl Pane {
.on_down(MouseButton::Left, move |_, cx| { .on_down(MouseButton::Left, move |_, cx| {
cx.dispatch_action(ActivateItem(ix)); cx.dispatch_action(ActivateItem(ix));
}) })
.on_click(MouseButton::Middle, close_tab_callback)
.boxed() .boxed()
}) })
} }