From 63b65b2b2e325c899778b3b08d409bb70bab1b88 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Fri, 1 Dec 2023 23:51:06 -0700 Subject: [PATCH] Dismiss tooltips at capture (Otherwise they stay open when you hover over the editor, which stops mouse move events propagating) --- crates/gpui2/src/elements/div.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs index ced0a4767c..68dca4c9d1 100644 --- a/crates/gpui2/src/elements/div.rs +++ b/crates/gpui2/src/elements/div.rs @@ -992,10 +992,6 @@ impl Interactivity { let interactive_bounds = interactive_bounds.clone(); cx.on_mouse_event(move |event: &MouseMoveEvent, phase, cx| { - if phase != DispatchPhase::Bubble { - return; - } - let is_hovered = interactive_bounds.visibly_contains(&event.position, cx) && pending_mouse_down.borrow().is_none(); if !is_hovered { @@ -1003,6 +999,10 @@ impl Interactivity { return; } + if phase != DispatchPhase::Bubble { + return; + } + if active_tooltip.borrow().is_none() { let task = cx.spawn({ let active_tooltip = active_tooltip.clone();