From c12bec704c07de2a08b12adb6bb443727dfff24e Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Sun, 18 May 2003 20:20:57 +0000
Subject: [PATCH] update the cursor on GDK_ENTER_NOTIFY.

2003-05-18  Michael Natterer  <mitch@gimp.org>

	* app/display/gimpdisplayshell-callbacks.c
	(gimp_display_shell_canvas_tool_events): update the cursor on
	GDK_ENTER_NOTIFY.

	* app/display/gimpdisplayshell-cursor.c
	(gimp_display_shell_update_cursor): argh, "0" coordinates are
	*inside* the canvas.

	Together fixes bug #113239.
---
 ChangeLog                                | 12 ++++++++++++
 app/display/gimpdisplayshell-callbacks.c |  2 ++
 app/display/gimpdisplayshell-cursor.c    |  6 +++---
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index adaafcc570..df09918ee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2003-05-18  Michael Natterer  <mitch@gimp.org>
+
+	* app/display/gimpdisplayshell-callbacks.c
+	(gimp_display_shell_canvas_tool_events): update the cursor on
+	GDK_ENTER_NOTIFY.
+
+	* app/display/gimpdisplayshell-cursor.c
+	(gimp_display_shell_update_cursor): argh, "0" coordinates are
+	*inside* the canvas.
+
+	Together fixes bug #113239.
+
 2003-05-18  Michael Natterer  <mitch@gimp.org>
 
 	* app/widgets/gimppaletteeditor.c (color_palette_target_table): 
diff --git a/app/display/gimpdisplayshell-callbacks.c b/app/display/gimpdisplayshell-callbacks.c
index 1a4c7ddd4e..d78e5f9b76 100644
--- a/app/display/gimpdisplayshell-callbacks.c
+++ b/app/display/gimpdisplayshell-callbacks.c
@@ -438,6 +438,8 @@ gimp_display_shell_canvas_tool_events (GtkWidget        *canvas,
 
         if (cevent->mode != GDK_CROSSING_NORMAL)
           return TRUE;
+
+        update_cursor = TRUE;
       }
       break;
 
diff --git a/app/display/gimpdisplayshell-cursor.c b/app/display/gimpdisplayshell-cursor.c
index 2c11270663..a9cdbc64e4 100644
--- a/app/display/gimpdisplayshell-cursor.c
+++ b/app/display/gimpdisplayshell-cursor.c
@@ -124,8 +124,8 @@ gimp_display_shell_update_cursor (GimpDisplayShell *shell,
 
   new_cursor = (shell->draw_cursor &&
                 shell->proximity   &&
-                x > 0              &&
-                y > 0);
+                x >= 0             &&
+                y >= 0);
 
   /* Erase old cursor, if necessary */
 
@@ -145,7 +145,7 @@ gimp_display_shell_update_cursor (GimpDisplayShell *shell,
   shell->cursor_x    = x;
   shell->cursor_y    = y;
 
-  if (x > 0 && y > 0)
+  if (x >= 0 && y >= 0)
     {
       gimp_display_shell_untransform_xy (shell, x, y, &t_x, &t_y, FALSE, FALSE);
     }