Commit 9719e5fb authored by Kristian Rietveld's avatar Kristian Rietveld Committed by Kristian Rietveld

handle no-window and regular widgets seperately.

2007-07-19  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktooltip.c (find_topmost_widget_coords_from_event): handle
	no-window and regular widgets seperately.

	* gtk/gtktreeview.c (gkt_tree_view_set_tooltip_cell): rect.x should
	be zero.


svn path=/trunk/; revision=18502
parent 7b2e82f5
2007-07-19 Kristian Rietveld <kris@imendio.com>
* gtk/gtktooltip.c (find_topmost_widget_coords_from_event): handle
no-window and regular widgets seperately.
* gtk/gtktreeview.c (gkt_tree_view_set_tooltip_cell): rect.x should
be zero.
2007-07-19 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk.symbols:
......
......@@ -593,12 +593,25 @@ find_topmost_widget_coords_from_event (GdkEvent *event,
tmp = find_widget_under_pointer (event->any.window, &tx, &ty);
/* Make sure the pointer can actually be on the widget returned */
if (!tmp ||
tx < 0 || tx >= tmp->allocation.width ||
ty < 0 || ty >= tmp->allocation.height)
if (!tmp)
return NULL;
/* Make sure the pointer can actually be on the widget returned */
if (GTK_WIDGET_NO_WINDOW (tmp))
{
if (tx < tmp->allocation.x ||
tx >= tmp->allocation.x + tmp->allocation.width ||
ty < tmp->allocation.y ||
ty >= tmp->allocation.y + tmp->allocation.height)
return NULL;
}
else
{
if (tx < 0 || tx >= tmp->allocation.width ||
ty < 0 || ty >= tmp->allocation.height)
return NULL;
}
if (x)
*x = tx;
if (y)
......
......@@ -15274,7 +15274,7 @@ gtk_tree_view_set_tooltip_cell (GtkTreeView *tree_view,
}
else
{
rect.x = GTK_WIDGET (tree_view)->allocation.x;
rect.x = 0;
rect.width = GTK_WIDGET (tree_view)->allocation.width;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment