mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 08:54:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #2063 from zed-industries/active-tab-close-icon-pointing-hand

Browse source 
Avoid stomping on tab close icon's cursor style
This commit is contained in:
Julia 2023-01-23 11:48:35 -05:00 committed by GitHub
commit 4678f6e0a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1150,7 +1150,7 @@ impl Pane {
row.add_child({ row.add_child({
enum Tab {} enum Tab {}
dragged_item_receiver::<Tab, _>(ix, ix, true, None, cx, { let mut receiver = dragged_item_receiver::<Tab, _>(ix, ix, true, None, cx, {
let item = item.clone(); let item = item.clone();
let pane = pane.clone(); let pane = pane.clone();
let detail = detail.clone(); let detail = detail.clone();
@ -1162,50 +1162,51 @@ impl Pane {
let hovered = mouse_state.hovered(); let hovered = mouse_state.hovered();
Self::render_tab(&item, pane, ix == 0, detail, hovered, tab_style, cx) Self::render_tab(&item, pane, ix == 0, detail, hovered, tab_style, cx)
} }
}) });
.with_cursor_style(if pane_active && tab_active {
CursorStyle::Arrow
} else {
CursorStyle::PointingHand
})
.on_down(MouseButton::Left, move |_, cx| {
cx.dispatch_action(ActivateItem(ix));
cx.propagate_event();
})
.on_click(MouseButton::Middle, {
let item = item.clone();
let pane = pane.clone();
move |_, cx: &mut EventContext| {
cx.dispatch_action(CloseItem {
item_id: item.id(),
pane: pane.clone(),
})
}
})
.as_draggable(
DraggedItem {
item,
pane: pane.clone(),
},
{
let theme = cx.global::<Settings>().theme.clone();
let detail = detail.clone(); if !pane_active || !tab_active {
move |dragged_item, cx: &mut RenderContext<Workspace>| { receiver = receiver.with_cursor_style(CursorStyle::PointingHand);
let tab_style = &theme.workspace.tab_bar.dragged_tab; }
Self::render_tab(
&dragged_item.item, receiver
dragged_item.pane.clone(), .on_down(MouseButton::Left, move |_, cx| {
false, cx.dispatch_action(ActivateItem(ix));
detail, cx.propagate_event();
false, })
&tab_style, .on_click(MouseButton::Middle, {
cx, let item = item.clone();
) let pane = pane.clone();
move |_, cx: &mut EventContext| {
cx.dispatch_action(CloseItem {
item_id: item.id(),
pane: pane.clone(),
})
} }
}, })
) .as_draggable(
.boxed() DraggedItem {
item,
pane: pane.clone(),
},
{
let theme = cx.global::<Settings>().theme.clone();
let detail = detail.clone();
move |dragged_item, cx: &mut RenderContext<Workspace>| {
let tab_style = &theme.workspace.tab_bar.dragged_tab;
Self::render_tab(
&dragged_item.item,
dragged_item.pane.clone(),
false,
detail,
false,
&tab_style,
cx,
)
}
},
)
.boxed()
}) })
} }