From 0b7072bf67b2a1cb08951baa03f57fadf712f8fc Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 11 Dec 2023 16:20:46 +0100 Subject: [PATCH 1/2] Fire click event only when using left button --- crates/gpui2/src/elements/div.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/crates/gpui2/src/elements/div.rs b/crates/gpui2/src/elements/div.rs index 10fd7dda0a..c27ac52cde 100644 --- a/crates/gpui2/src/elements/div.rs +++ b/crates/gpui2/src/elements/div.rs @@ -964,6 +964,7 @@ impl Interactivity { let interactive_bounds = interactive_bounds.clone(); cx.on_mouse_event(move |event: &MouseDownEvent, phase, cx| { if phase == DispatchPhase::Bubble + && event.button == MouseButton::Left && interactive_bounds.visibly_contains(&event.position, cx) { *pending_mouse_down.borrow_mut() = Some(event.clone()); From d678efe7ddd01ad5635d76bbba7c384d64f5a26f Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 11 Dec 2023 09:29:10 -0700 Subject: [PATCH 2/2] Fix some action registrations --- crates/gpui2/src/action.rs | 2 ++ crates/terminal_view2/src/terminal_panel.rs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/gpui2/src/action.rs b/crates/gpui2/src/action.rs index bf03c87ae9..54682a30ef 100644 --- a/crates/gpui2/src/action.rs +++ b/crates/gpui2/src/action.rs @@ -183,6 +183,8 @@ macro_rules! impl_actions { Ok(std::boxed::Box::new(gpui::serde_json::from_value::(value)?)) } ); + + gpui::register_action!($name); )* }; } diff --git a/crates/terminal_view2/src/terminal_panel.rs b/crates/terminal_view2/src/terminal_panel.rs index 3d88b89d9b..fa266ceb6c 100644 --- a/crates/terminal_view2/src/terminal_panel.rs +++ b/crates/terminal_view2/src/terminal_panel.rs @@ -24,7 +24,7 @@ use anyhow::Result; const TERMINAL_PANEL_KEY: &'static str = "TerminalPanel"; -actions!(terminal_view, [ToggleFocus]); +actions!(terminal_panel, [ToggleFocus]); pub fn init(cx: &mut AppContext) { cx.observe_new_views(