mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-29 12:38:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix editor selection issue (#4110)

Browse source 
Release Notes:

- Fixes a bug where, editor selections would update in the wrong pane
when split.
This commit is contained in:
Mikayla Maki 2024-01-17 17:16:56 -08:00 committed by GitHub
commit 933fb87013
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/editor/src/element.rs
View file

@ -456,6 +456,7 @@ impl EditorElement {
event: &MouseUpEvent, event: &MouseUpEvent,
position_map: &PositionMap, position_map: &PositionMap,
text_bounds: Bounds<Pixels>, text_bounds: Bounds<Pixels>,
interactive_bounds: &InteractiveBounds,
stacking_order: &StackingOrder, stacking_order: &StackingOrder,
cx: &mut ViewContext<Editor>, cx: &mut ViewContext<Editor>,
) { ) {
@ -466,7 +467,8 @@ impl EditorElement {
editor.select(SelectPhase::End, cx); editor.select(SelectPhase::End, cx);
} }
if !pending_nonempty_selections if interactive_bounds.visibly_contains(&event.position, cx)
&& !pending_nonempty_selections
&& event.modifiers.command && event.modifiers.command
&& text_bounds.contains(&event.position) && text_bounds.contains(&event.position)
&& cx.was_top_layer(&event.position, stacking_order) && cx.was_top_layer(&event.position, stacking_order)
@ -2542,15 +2544,14 @@ impl EditorElement {
let interactive_bounds = interactive_bounds.clone(); let interactive_bounds = interactive_bounds.clone();
move |event: &MouseUpEvent, phase, cx| { move |event: &MouseUpEvent, phase, cx| {
if phase == DispatchPhase::Bubble if phase == DispatchPhase::Bubble {
&& interactive_bounds.visibly_contains(&event.position, cx)
{
editor.update(cx, |editor, cx| { editor.update(cx, |editor, cx| {
Self::mouse_up( Self::mouse_up(
editor, editor,
event, event,
&position_map, &position_map,
text_bounds, text_bounds,
&interactive_bounds,
&stacking_order, &stacking_order,
cx, cx,
) )