From 0a341261d06836f45d1d95a0c2f5ad249749283b Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Tue, 12 Mar 2024 12:24:15 +0100 Subject: [PATCH] Insert hitbox when an interactive element can be scrolled (#9216) Fixes https://github.com/zed-industries/zed/issues/9199 Release Notes: - N/A --- crates/gpui/src/elements/div.rs | 1 + crates/gpui/src/window/element_cx.rs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/gpui/src/elements/div.rs b/crates/gpui/src/elements/div.rs index 5b8aab174a..69929ec8ab 100644 --- a/crates/gpui/src/elements/div.rs +++ b/crates/gpui/src/elements/div.rs @@ -1306,6 +1306,7 @@ impl Interactivity { || self.group.is_some() || self.has_hover_styles() || self.has_mouse_listeners() + || self.scroll_offset.is_some() { Some(cx.insert_hitbox(bounds, self.occlude_mouse)) } else { diff --git a/crates/gpui/src/window/element_cx.rs b/crates/gpui/src/window/element_cx.rs index 4a30becbe2..d04a903bdf 100644 --- a/crates/gpui/src/window/element_cx.rs +++ b/crates/gpui/src/window/element_cx.rs @@ -61,7 +61,7 @@ impl HitboxId { /// A rectangular region that potentially blocks hitboxes inserted prior. /// See [ElementContext::insert_hitbox] for more details. -#[derive(Clone, Debug, Eq, PartialEq, Deref)] +#[derive(Clone, Debug, Deref)] pub struct Hitbox { /// A unique identifier for the hitbox pub id: HitboxId,