* (compute_tip_xy): Calculate root_y the same way as root_x,

i.e. dy is offset from top of frame instead of bottom.

1 files changed, 8 insertions, 6 deletions

diff --git a/src/macfns.c b/src/macfns.c
index 9d23f47b5ed..de6a055fce6 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -3840,13 +3840,15 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
 
   if (INTEGERP (top))
     *root_y = XINT (top);
-  else if (*root_y + XINT (dy) - height < 0)
-    *root_y -= XINT (dy);
-  else
-    {
-      *root_y -= height;
+  else if (*root_y + XINT (dy) + height <= FRAME_MAC_DISPLAY_INFO (f)->height)
+    /* It fits below the pointer */
       *root_y += XINT (dy);
-    }
+  else if (height + XINT (dy) <= *root_y)
+    /* It fits above the pointer.  */
+    *root_y -= height + XINT (dy);
+  else
+    /* Put it on the top.  */
+    *root_y = 0;
 
   if (INTEGERP (left))
     *root_x = XINT (left);