From 9b32678b05d3707cb287ffea44ac4679f20b7a0c Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla@zed.dev>
Date: Tue, 27 Sep 2022 16:43:32 -0700
Subject: [PATCH] Fixed terminal stealing focus

---
 crates/terminal/src/terminal_element.rs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/crates/terminal/src/terminal_element.rs b/crates/terminal/src/terminal_element.rs
index 8cb193555d..e7fd69fe49 100644
--- a/crates/terminal/src/terminal_element.rs
+++ b/crates/terminal/src/terminal_element.rs
@@ -453,13 +453,15 @@ impl TerminalElement {
                     }
                 }
             })
-            .on_scroll(TerminalElement::generic_button_handler(
-                connection,
-                origin,
-                move |terminal, origin, e, _cx| {
-                    terminal.scroll_wheel(e, origin);
-                },
-            ));
+            .on_scroll(move |event, cx| {
+                // cx.focus_parent_view();
+                if let Some(conn_handle) = connection.upgrade(cx.app) {
+                    conn_handle.update(cx.app, |terminal, cx| {
+                        terminal.scroll_wheel(event, origin);
+                        cx.notify();
+                    })
+                }
+            });
 
         // Mouse mode handlers:
         // All mouse modes need the extra click handlers