change pos_and_view back to pos_at_screen_coords

helix-editor · Dec 22, 2022 · de52c10 · de52c10
1 parent 475ce49
commit de52c10
Showing 1 changed file with 12 additions and 13 deletions.
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
@@ -1181,21 +1181,20 @@ impl EditorView {
             }
 
             MouseEventKind::Drag(MouseButton::Left) => {
-                let editor = &mut cxt.editor;
-
-                if let Some((pos, view_id)) = pos_and_view(editor, row, column) {
-                    let doc = doc_mut!(editor, &view!(editor, view_id).doc);
-
-                    let mut selection = doc.selection(view_id).clone();
-                    let primary = selection.primary_mut();
-                    *primary = primary.put_cursor(doc.text().slice(..), pos, true);
-                    doc.set_selection(view_id, selection);
+                let (view, doc) = current!(cxt.editor);
 
-                    editor.ensure_cursor_in_view(view_id);
+                let pos = match view.pos_at_screen_coords(doc, row, column) {
+                    Some(pos) => pos,
+                    None => return EventResult::Ignored(None),
+                };
 
-                    return EventResult::Consumed(None);
-                }
-                EventResult::Ignored(None)
+                let mut selection = doc.selection(view.id).clone();
+                let primary = selection.primary_mut();
+                *primary = primary.put_cursor(doc.text().slice(..), pos, true);
+                doc.set_selection(view.id, selection);
+                let view_id = view.id;
+                cxt.editor.ensure_cursor_in_view(view_id);
+                EventResult::Consumed(None)
             }
 
             MouseEventKind::ScrollUp | MouseEventKind::ScrollDown => {