callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdk: remove convert_coords_to_child()

Browse Source 
and use the new public gdk_window_coords_from_parent().
This commit is contained in:
Michael Natterer 2010-04-15 13:16:17 +02:00
parent 878cde53d0
commit 9cac8f23d5
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gdk/gdkwindow.c
View File

@ -9184,25 +9184,6 @@ update_cursor (GdkDisplay *display)
impl_iface->set_cursor ((GdkWindow *)toplevel, cursor_window->cursor); impl_iface->set_cursor ((GdkWindow *)toplevel, cursor_window->cursor);
} }
static void
convert_coords_to_child (GdkWindowObject *child,
gdouble x,
gdouble y,
gdouble *child_x,
gdouble *child_y)
{
if (gdk_window_is_offscreen (child))
{
from_embedder (child, x, y,
child_x, child_y);
}
else
{
*child_x = x - child->x;
*child_y = y - child->y;
}
}
static gboolean static gboolean
point_in_window (GdkWindowObject *window, point_in_window (GdkWindowObject *window,
gdouble x, gdouble x,
@ -9271,7 +9252,7 @@ convert_toplevel_coords_to_window (GdkWindow *window,
} }
for (l = children; l != NULL; l = l->next) for (l = children; l != NULL; l = l->next)
convert_coords_to_child (l->data, x, y, &x, &y); gdk_window_coords_from_parent (l->data, x, y, &x, &y);
g_list_free (children); g_list_free (children);
@ -9315,9 +9296,9 @@ _gdk_window_find_child_at (GdkWindow *window,
if (!GDK_WINDOW_IS_MAPPED (sub)) if (!GDK_WINDOW_IS_MAPPED (sub))
continue; continue;
convert_coords_to_child (sub, gdk_window_coords_from_parent ((GdkWindow *)sub,
x, y, x, y,
&child_x, &child_y); &child_x, &child_y);
if (point_in_window (sub, child_x, child_y)) if (point_in_window (sub, child_x, child_y))
return (GdkWindow *)sub; return (GdkWindow *)sub;
} }
@ -9361,9 +9342,9 @@ _gdk_window_find_descendant_at (GdkWindow *toplevel,
if (!GDK_WINDOW_IS_MAPPED (sub)) if (!GDK_WINDOW_IS_MAPPED (sub))
continue; continue;
convert_coords_to_child (sub, gdk_window_coords_from_parent ((GdkWindow *)sub,
x, y, x, y,
&child_x, &child_y); &child_x, &child_y);
if (point_in_window (sub, child_x, child_y)) if (point_in_window (sub, child_x, child_y))
{ {
x = child_x; x = child_x;