mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-29 05:33:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fixed merge conflict

Browse source
This commit is contained in:
Mikayla Maki 2022-07-07 14:54:36 -07:00
parent 415e28e2d3
commit b5919c0555
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -255,6 +255,7 @@ impl Element for TerminalEl {
let (point, side) = mouse_to_cell_data(pos, origin, cur_size, display_offset); let (point, side) = mouse_to_cell_data(pos, origin, cur_size, display_offset);
let selection_type = match click_count { let selection_type = match click_count {
0 => return, //This is a release
1 => Some(SelectionType::Simple), 1 => Some(SelectionType::Simple),
2 => Some(SelectionType::Semantic), 2 => Some(SelectionType::Semantic),
3 => Some(SelectionType::Lines), 3 => Some(SelectionType::Lines),
@ -279,8 +280,7 @@ impl Element for TerminalEl {
} else { } else {
term.selection = Some(Selection::new(SelectionType::Simple, point, side)); term.selection = Some(Selection::new(SelectionType::Simple, point, side));
} }
cx.notify();
cx.notify()
})), })),
..Default::default() ..Default::default()
}); });