mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-12 21:32:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #1663 from zed-industries/terminal-bugs

Browse source 
A few small bug fixes
This commit is contained in:
Mikayla Maki 2022-09-27 17:18:21 -07:00 committed by GitHub
commit 500ff131db
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/terminal/src/terminal_element.rs
View file

@ -453,13 +453,15 @@ impl TerminalElement {
} }
} }
}) })
.on_scroll(TerminalElement::generic_button_handler( .on_scroll(move |event, cx| {
connection, // cx.focus_parent_view();
origin, if let Some(conn_handle) = connection.upgrade(cx.app) {
move |terminal, origin, e, _cx| { conn_handle.update(cx.app, |terminal, cx| {
terminal.scroll_wheel(e, origin); terminal.scroll_wheel(event, origin);
}, cx.notify();
)); })
}
});
// Mouse mode handlers: // Mouse mode handlers:
// All mouse modes need the extra click handlers // All mouse modes need the extra click handlers

1
crates/workspace/src/pane.rs
View file

@ -1493,6 +1493,7 @@ impl View for Pane {
.last_focused_view .last_focused_view
.as_ref() .as_ref()
.and_then(|handle| handle.upgrade(cx)) .and_then(|handle| handle.upgrade(cx))
.filter(|handle| handle.id() != self.tab_bar_context_menu.id())
{ {
cx.focus(last_focused_view); cx.focus(last_focused_view);
} else { } else {