Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix terminal selection firing when dragging anywhere

Browse source
This commit is contained in:
Mikayla 2024-01-19 15:02:10 -08:00
parent eaa0e93112
commit 25f78a2ed1
No known key found for this signature in database
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/terminal/src/terminal.rs
View file

@ -599,6 +599,10 @@ impl Terminal {
} }
} }
pub fn selection_started(&self) -> bool {
self.selection_phase == SelectionPhase::Selecting
}
/// Updates the cached process info, returns whether the Zed-relevant info has changed /// Updates the cached process info, returns whether the Zed-relevant info has changed
fn update_process_info(&mut self) -> bool { fn update_process_info(&mut self) -> bool {
let mut pid = unsafe { libc::tcgetpgrp(self.shell_fd as i32) }; let mut pid = unsafe { libc::tcgetpgrp(self.shell_fd as i32) };

12
crates/terminal_view/src/terminal_element.rs
View file

@ -621,9 +621,17 @@ impl TerminalElement {
} }
if e.pressed_button.is_some() && !cx.has_active_drag() { if e.pressed_button.is_some() && !cx.has_active_drag() {
let visibly_contains = interactive_bounds.visibly_contains(&e.position, cx);
terminal.update(cx, |terminal, cx| { terminal.update(cx, |terminal, cx| {
terminal.mouse_drag(e, origin, bounds); if !terminal.selection_started() {
cx.notify(); if visibly_contains {
terminal.mouse_drag(e, origin, bounds);
cx.notify();
}
} else {
terminal.mouse_drag(e, origin, bounds);
cx.notify();
}
}) })
} }