diff options
| author | Aaron Jensen | 2018-05-24 03:45:03 -0700 |
|---|---|---|
| committer | Alan Third | 2018-06-17 11:50:57 +0100 |
| commit | ebe065fddf76fde64a9c07b419b67fe47fb6c1cb (patch) | |
| tree | 9bc1e2ed312704df5347bfc707bb3485a71c5552 /src | |
| parent | ffd20184ca9bb026064f28aa260f2298baeb7fc8 (diff) | |
| download | emacs-ebe065fddf76fde64a9c07b419b67fe47fb6c1cb.tar.gz emacs-ebe065fddf76fde64a9c07b419b67fe47fb6c1cb.zip | |
Prevent errant scroll on mouse click (Bug#31546)
* src/nsterm.m (ns_mouse_position): Use correct frame when determining
mouse position.
* lisp/mouse.el (mouse-drag-track): Only account for mode-line height
if `mode-line-format' is non-nil.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index e4a9b014f49..1afd637b619 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -2547,7 +2547,7 @@ ns_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window, | |||
| 2547 | 2547 | ||
| 2548 | if (f && FRAME_NS_P (f)) | 2548 | if (f && FRAME_NS_P (f)) |
| 2549 | { | 2549 | { |
| 2550 | view = FRAME_NS_VIEW (*fp); | 2550 | view = FRAME_NS_VIEW (f); |
| 2551 | 2551 | ||
| 2552 | position = [[view window] mouseLocationOutsideOfEventStream]; | 2552 | position = [[view window] mouseLocationOutsideOfEventStream]; |
| 2553 | position = [view convertPoint: position fromView: nil]; | 2553 | position = [view convertPoint: position fromView: nil]; |