mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 05:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Insert hitbox if div contains tooltip (#9545)

Browse source 
Release Notes:

- Fixed a bug that would cause certain tooltips to not show up
(preview-only).
This commit is contained in:
Antonio Scandurra 2024-03-19 19:02:59 +01:00 committed by GitHub
parent ac6c4f3ca8
commit 2ea333fff6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/gpui/src/elements/div.rs
View file

@ -1301,14 +1301,7 @@ impl Interactivity {
cx.with_text_style(style.text_style().cloned(), |cx| {
cx.with_content_mask(style.overflow_mask(bounds, cx.rem_size()), |cx| {
let hitbox = if self.occlude_mouse
|| style.mouse_cursor.is_some()
|| self.group.is_some()
|| self.has_hover_styles()
|| self.has_mouse_listeners()
|| self.scroll_offset.is_some()
|| self.tracked_focus_handle.is_some()
{
let hitbox = if self.should_insert_hitbox(&style) {
Some(cx.insert_hitbox(bounds, self.occlude_mouse))
} else {
None
@ -1323,18 +1316,22 @@ impl Interactivity {
)
}
fn has_hover_styles(&self) -> bool {
self.hover_style.is_some() || self.group_hover_style.is_some()
}
fn has_mouse_listeners(&self) -> bool {
!self.mouse_up_listeners.is_empty()
fn should_insert_hitbox(&self, style: &Style) -> bool {
self.occlude_mouse
|| style.mouse_cursor.is_some()
|| self.group.is_some()
|| self.scroll_offset.is_some()
|| self.tracked_focus_handle.is_some()
|| self.hover_style.is_some()
|| self.group_hover_style.is_some()
|| !self.mouse_up_listeners.is_empty()
|| !self.mouse_down_listeners.is_empty()
|| !self.mouse_move_listeners.is_empty()
|| !self.click_listeners.is_empty()
|| !self.scroll_wheel_listeners.is_empty()
|| self.drag_listener.is_some()
|| !self.drop_listeners.is_empty()
|| self.tooltip_builder.is_some()
}
fn clamp_scroll_position(