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

Detect and open URLs properly

Browse source
This commit is contained in:
Kirill Bulatov 2023-07-15 01:11:20 +03:00
parent 23f25562b5
commit 6123c67de9
3 changed files with 79 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/terminal_view/src/terminal_element.rs
View file

@ -583,17 +583,23 @@ impl Element<TerminalView> for TerminalElement {
let last_hovered_hyperlink = terminal_handle.update(cx, |terminal, cx| {
terminal.set_size(dimensions);
terminal.try_sync(cx);
terminal.last_content.last_hovered_hyperlink.clone()
terminal.last_content.last_hovered_word.clone()
});
let hyperlink_tooltip = last_hovered_hyperlink.map(|(uri, _, id)| {
let hyperlink_tooltip = last_hovered_hyperlink.map(|hovered_word| {
let mut tooltip = Overlay::new(
Empty::new()
.contained()
.constrained()
.with_width(dimensions.width())
.with_height(dimensions.height())
.with_tooltip::<TerminalElement>(id, uri, None, tooltip_style, cx),
.with_tooltip::<TerminalElement>(
hovered_word.id,
hovered_word.word,
None,
tooltip_style,
cx,
),
)
.with_position_mode(gpui::elements::OverlayPositionMode::Local)
.into_any();
@ -613,7 +619,7 @@ impl Element<TerminalView> for TerminalElement {
cursor_char,
selection,
cursor,
last_hovered_hyperlink,
last_hovered_word,
..
} = { &terminal_handle.read(cx).last_content };
@ -634,9 +640,9 @@ impl Element<TerminalView> for TerminalElement {
&terminal_theme,
cx.text_layout_cache(),
cx.font_cache(),
last_hovered_hyperlink
last_hovered_word
.as_ref()
.map(|(_, range, _)| (link_style, range)),
.map(|last_hovered_word| (link_style, &last_hovered_word.word_match)),
);
//Layout cursor. Rectangle is used for IME, so we should lay it out even