From 0a02691778855a6897030bde89325fe49cae0c0f Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Sat, 20 Jul 2024 02:49:08 +0800 Subject: [PATCH] Fix tooltips sometimes continuously displaying when the button is selected (#14832) Release Notes: - Fixed sometime tooltip will continuously display when the button is selected. --- @mrnugget The #13857 This change has led into a bug, the selected item before tooltip will continuous display if there are no other tooltips. https://github.com/user-attachments/assets/06b4a9a4-dede-4c18-b020-e20b6090341f --- crates/gpui/src/elements/div.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs index d9b2329658617055c5d45e341e302621724e598f..6979b58567d5754f07dcc1af1b7a781a87eb1448 100644 --- a/crates/gpui/src/elements/div.rs +++ b/crates/gpui/src/elements/div.rs @@ -1869,6 +1869,11 @@ impl Interactivity { }); } + // Ensure to remove active tooltip if tooltip builder is none + if self.tooltip_builder.is_none() { + element_state.active_tooltip.take(); + } + if let Some(tooltip_builder) = self.tooltip_builder.take() { let tooltip_is_hoverable = tooltip_builder.hoverable; let active_tooltip = element_state