zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-08 07:35:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Restore the hitbox of the excerpt header (#9790)

Browse Source 
In https://github.com/zed-industries/zed/pull/9722, the
jump-to-excerpt-source buttons where shrunk too far.

Release Notes:

- N/A
This commit is contained in:
Mikayla Maki 2024-03-25 12:41:54 -07:00 committed by GitHub
parent 00a8659491
commit bdea804c48
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
crates/editor/src/element.rs
View File

@ -1497,47 +1497,17 @@ impl EditorElement {
.v_flex() .v_flex()
.justify_start() .justify_start()
.id("jump to collapsed context") .id("jump to collapsed context")
.group("")
.w(relative(1.0)) .w(relative(1.0))
.h_full() .h_full()
.cursor_pointer()
.child( .child(
div() div()
.h_px() .h_px()
.w_full() .w_full()
.bg(cx.theme().colors().border_variant) .bg(cx.theme().colors().border_variant)
.group_hover("", |style| { .group_hover("excerpt-jump-action", |style| {
style.bg(cx.theme().colors().border) style.bg(cx.theme().colors().border)
}), }),
) ),
.when_some(jump_data.clone(), |this, jump_data| {
this.on_click(cx.listener_for(&self.editor, {
let path = jump_data.path.clone();
move |editor, _, cx| {
cx.stop_propagation();
editor.jump(
path.clone(),
jump_data.position,
jump_data.anchor,
cx,
);
}
}))
.tooltip(
move |cx| {
Tooltip::for_action(
format!(
"Jump to {}:L{}",
jump_data.path.path.display(),
jump_data.position.row + 1
),
&OpenExcerpts,
cx,
)
},
)
}),
) )
.child( .child(
h_flex() h_flex()
@ -1555,7 +1525,7 @@ impl EditorElement {
.path(IconName::ArrowUpRight.path()) .path(IconName::ArrowUpRight.path())
.size(IconSize::XSmall.rems()) .size(IconSize::XSmall.rems())
.text_color(cx.theme().colors().border) .text_color(cx.theme().colors().border)
.group_hover("", |style| { .group_hover("excerpt-jump-action", |style| {
style.text_color( style.text_color(
cx.theme().colors().editor_line_number, cx.theme().colors().editor_line_number,
) )
@ -1589,6 +1559,34 @@ impl EditorElement {
}), }),
), ),
) )
.group("excerpt-jump-action")
.cursor_pointer()
.when_some(jump_data.clone(), |this, jump_data| {
this.on_click(cx.listener_for(&self.editor, {
let path = jump_data.path.clone();
move |editor, _, cx| {
cx.stop_propagation();
editor.jump(
path.clone(),
jump_data.position,
jump_data.anchor,
cx,
);
}
}))
.tooltip(move |cx| {
Tooltip::for_action(
format!(
"Jump to {}:L{}",
jump_data.path.path.display(),
jump_data.position.row + 1
),
&OpenExcerpts,
cx,
)
})
})
}; };
element.into_any() element.into_any()
} }