From: Kim F. Storm <storm@cua.dk>
Date: Wed, 8 May 2002 21:30:57 +0000 (+0000)
Subject: (x_draw_image_foreground, w32_draw_image_foreground_1):
X-Git-Tag: ttn-vms-21-2-B4~15136
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c65eff23e27dc22b32f5c4b0f0070c8a717b2f5d;p=emacs.git

(x_draw_image_foreground, w32_draw_image_foreground_1):
Enlarge cursor rectangle drawn around image with non-zero relief.
---

diff --git a/src/w32term.c b/src/w32term.c
index 90c82c6661b..eb055dab044 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -3946,8 +3946,12 @@ x_draw_image_foreground (s)
 	     the image.  I believe it's looking better if we do
 	     nothing here for mouse-face.  */
 	  if (s->hl == DRAW_CURSOR)
-            w32_draw_rectangle (s->hdc, s->gc, x, y, s->img->width - 1,
-                                s->img->height - 1);
+	    {
+	      int r = s->img->relief;
+	      if (r < 0) r = -r;
+	      w32_draw_rectangle (s->hdc, s->gc, x - r, y - r ,
+				  s->img->width + r*2 - 1, s->img->height + r*2 - 1);
+	    }
           w32_set_clip_rectangle (s->hdc, NULL);
 	}
     }
@@ -4087,8 +4091,12 @@ w32_draw_image_foreground_1 (s, pixmap)
 	     the image.  I believe it's looking better if we do
 	     nothing here for mouse-face.  */
 	  if (s->hl == DRAW_CURSOR)
-            w32_draw_rectangle (hdc, s->gc, x, y, s->img->width - 1,
-                                s->img->height - 1);
+	    {
+	      int r = s->img->relief;
+	      if (r < 0) r = -r;
+	      w32_draw_rectangle (s->hdc, s->gc, x - r, y - r ,
+				  s->img->width + r*2 - 1, s->img->height + r*2 - 1);
+	    }
 	}
     }
   else