aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2005-12-02 18:32:46 +0000
committerEli Zaretskii2005-12-02 18:32:46 +0000
commit5a98616edfc27abf7f6e8b835477fa818dd9bc41 (patch)
treef4b44db62434b9b83c3f7f89fe805462bd2d6ca1
parented0e38790bd5fa58e7f21947c7de4e916826bdff (diff)
downloademacs-5a98616edfc27abf7f6e8b835477fa818dd9bc41.tar.gz
emacs-5a98616edfc27abf7f6e8b835477fa818dd9bc41.zip
(compute_tip_xy): Put tip above pointer if it doesn't fit below.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32fns.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index cadfad7c48f..ee9eed6739b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12005-12-02 Eli Zaretskii <eliz@gnu.org>
2
3 * w32fns.c (compute_tip_xy): Put tip above pointer if it doesn't
4 fit below.
5
12005-12-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> 62005-12-02 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
2 7
3 * xterm.h: Add prototype for xg_set_icon_from_xpm_data. 8 * xterm.h: Add prototype for xg_set_icon_from_xpm_data.
diff --git a/src/w32fns.c b/src/w32fns.c
index e18ee3d43a9..6fc6c860808 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -7413,6 +7413,9 @@ compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
7413 *root_y = XINT (top); 7413 *root_y = XINT (top);
7414 else if (*root_y + XINT (dy) - height < 0) 7414 else if (*root_y + XINT (dy) - height < 0)
7415 *root_y -= XINT (dy); 7415 *root_y -= XINT (dy);
7416 /* If there's not enough place below the pointer, put tip above it. */
7417 else if (*root_y + XINT (dy) >= FRAME_W32_DISPLAY_INFO (f)->height)
7418 *root_y -= XINT (dy);
7416 else 7419 else
7417 { 7420 {
7418 *root_y -= height; 7421 *root_y -= height;