AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-30 02:57:38 +00:00
Code Issues Projects Releases Wiki Activity

treeview: Do a simple replace for gdk_window_get_pointer()

Browse Source 
Replace it with the equivalent gdk_window_get_device_position() with the
core pointer.
This commit is contained in:
Benjamin Otte 2011-11-09 02:52:50 +01:00
parent c9c9099f83
commit 2783158f8d
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/gtktreeview.c
View File

@ -4006,7 +4006,11 @@ gtk_tree_view_vertical_autoscroll (GtkTreeView *tree_view)
gint y; gint y;
gint offset; gint offset;
gdk_window_get_pointer (tree_view->priv->bin_window, NULL, &y, NULL); gdk_window_get_device_position (tree_view->priv->bin_window,
gdk_device_manager_get_client_pointer (
gdk_display_get_device_manager (
gtk_widget_get_display (GTK_WIDGET (tree_view)))),
NULL, &y, NULL);
y += tree_view->priv->dy; y += tree_view->priv->dy;
gtk_tree_view_get_visible_rect (tree_view, &visible_rect); gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
@ -4352,7 +4356,11 @@ gtk_tree_view_update_rubber_band (GtkTreeView *tree_view)
old_area.width = ABS (tree_view->priv->rubber_band_x - tree_view->priv->press_start_x) + 1; old_area.width = ABS (tree_view->priv->rubber_band_x - tree_view->priv->press_start_x) + 1;
old_area.height = ABS (tree_view->priv->rubber_band_y - tree_view->priv->press_start_y) + 1; old_area.height = ABS (tree_view->priv->rubber_band_y - tree_view->priv->press_start_y) + 1;
gdk_window_get_pointer (tree_view->priv->bin_window, &x, &y, NULL); gdk_window_get_device_position (tree_view->priv->bin_window,
gdk_device_manager_get_client_pointer (
gdk_display_get_device_manager (
gtk_widget_get_display (GTK_WIDGET (tree_view)))),
&x, &y, NULL);
x = MAX (x, 0); x = MAX (x, 0);
y = MAX (y, 0) + tree_view->priv->dy; y = MAX (y, 0) + tree_view->priv->dy;
@ -7162,8 +7170,11 @@ drag_scan_timeout (gpointer data)
tree_view = GTK_TREE_VIEW (data); tree_view = GTK_TREE_VIEW (data);
gdk_window_get_pointer (tree_view->priv->bin_window, gdk_window_get_device_position (tree_view->priv->bin_window,
&x, &y, &state); gdk_device_manager_get_client_pointer (
gdk_display_get_device_manager (
gtk_widget_get_display (GTK_WIDGET (tree_view)))),
&x, &y, &state);
gtk_tree_view_get_visible_rect (tree_view, &visible_rect); gtk_tree_view_get_visible_rect (tree_view, &visible_rect);
@ -12759,7 +12770,7 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
gboolean collapse; gboolean collapse;
gint x, y; gint x, y;
GList *list; GList *list;
GdkWindow *child, *parent; GdkWindow *child;
if (animate) if (animate)
g_object_get (gtk_widget_get_settings (GTK_WIDGET (tree_view)), g_object_get (gtk_widget_get_settings (GTK_WIDGET (tree_view)),
@ -12888,10 +12899,12 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
/* now that we've collapsed all rows, we want to try to set the prelight /* now that we've collapsed all rows, we want to try to set the prelight
* again. To do this, we fake a motion event and send it to ourselves. */ * again. To do this, we fake a motion event and send it to ourselves. */
child = tree_view->priv->bin_window; child = gdk_window_get_device_position (gdk_window_get_parent (tree_view->priv->bin_window),
parent = gdk_window_get_parent (child); gdk_device_manager_get_client_pointer (
gdk_display_get_device_manager (
if (gdk_window_get_pointer (parent, &x, &y, NULL) == child) gtk_widget_get_display (GTK_WIDGET (tree_view)))),
&x, &y, NULL);
if (child == tree_view->priv->bin_window)
{ {
GdkEventMotion event; GdkEventMotion event;
gint child_x, child_y; gint child_x, child_y;