always set hide_tooltip to TRUE if we are handling a leave notify event.

2007-08-21  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktooltip.c (_gtk_tooltip_handle_event): always set
	hide_tooltip to TRUE if we are handling a leave notify event. (Fixes
	#468245, reported by Dennis Jacobfeuerborn).

svn path=/trunk/; revision=18666

diff --git a/ChangeLog b/ChangeLog
index 908c4685778403c3e5224a31bb99cb01027c524a..9ac9d8d71c56d4eaa7d8ae2bb4f0c51ea92d0ee0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-21  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktooltip.c (_gtk_tooltip_handle_event): always set
+       hide_tooltip to TRUE if we are handling a leave notify event. (Fixes
+       #468245, reported by Dennis Jacobfeuerborn).
+
 2007-08-21  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkpaned.c (gtk_paned_class_init): applied patch from Mikael

diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 46ca8179abe3b42f884a4228e2f486eb8b4bf8b5..25dc578ebe245f4727482235203f2f06b6cc413f 100644 (file)
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1223,6 +1223,9 @@ _gtk_tooltip_handle_event (GdkEvent *event)
            /* Requested to be hidden? */
            hide_tooltip = !return_value;
 
+           /* Leave notify should override the query function */
+           hide_tooltip = (event->type == GDK_LEAVE_NOTIFY);
+
            /* Is the pointer above another widget now? */
            if (GTK_TOOLTIP_VISIBLE (current_tooltip))
              hide_tooltip |= has_tooltip_widget != current_tooltip->tooltip_widget;