bug#31546: 27.0.50; macOS child frames with no mode-line mouse click problem

[Aaron Jensen <aaronjensen@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 96 bytes --]

Here is an updated patch which includes Alan's changes. Any concerns with this?

Thanks,

Aaron

[-- Attachment #2: 0001-Prevent-errant-scroll-on-mouse-click-Bug-31546.patch --]
[-- Type: application/octet-stream, Size: 1464 bytes --]

From 02acfa6aa8132d767bf71390b101cd29fd5c1b44 Mon Sep 17 00:00:00 2001
From: Aaron Jensen <aaronjensen@gmail.com>
Date: Thu, 24 May 2018 03:45:03 -0700
Subject: [PATCH] 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.
---
 lisp/mouse.el | 3 ++-
 src/nsterm.m  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 95aada9b15..6a45118de0 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1219,7 +1219,8 @@ mouse-drag-track
 	 (bounds (window-edges start-window))
 	 (make-cursor-line-fully-visible nil)
 	 (top (nth 1 bounds))
-	 (bottom (if (window-minibuffer-p start-window)
+	 (bottom (if (or (window-minibuffer-p start-window)
+                         (not mode-line-format))
 		     (nth 3 bounds)
 		   ;; Don't count the mode line.
 		   (1- (nth 3 bounds))))
diff --git a/src/nsterm.m b/src/nsterm.m
index 3c95fedadc..fcbac1733b 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -2581,7 +2581,7 @@ so some key presses (TAB) are swallowed by the system.  */
 
   if (f && FRAME_NS_P (f))
     {
-      view = FRAME_NS_VIEW (*fp);
+      view = FRAME_NS_VIEW (f);
 
       position = [[view window] mouseLocationOutsideOfEventStream];
       position = [view convertPoint: position fromView: nil];
-- 
2.17.0