AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-06 19:00:12 +00:00
Code Issues Projects Releases Wiki Activity

gtkmain: Use window-internal API to update pointer cursors

Browse Source
This commit is contained in:
Carlos Garnacho 2017-04-04 17:09:22 +02:00
parent 599344d428
commit fa04bf6238
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkmain.c
View File

@ -1301,23 +1301,6 @@ check_event_in_child_popover (GtkWidget *event_widget,
return (popover_parent == grab_widget || gtk_widget_is_ancestor (popover_parent, grab_widget));
}
static void
update_cursor (GtkWindow *toplevel,
GdkDevice *device,
GtkWidget *target)
{
GdkCursor *cursor = NULL;
while (!cursor && target)
{
cursor = gtk_widget_get_cursor (target);
target = _gtk_widget_get_parent (target);
}
gdk_window_set_device_cursor (gtk_widget_get_window (GTK_WIDGET (toplevel)),
device, cursor);
}
static GdkNotifyType
get_virtual_notify_type (GdkNotifyType notify_type)
{
@ -1503,7 +1486,7 @@ handle_pointing_event (GdkEvent *event)
target = _gtk_toplevel_pick (toplevel, x, y, NULL, NULL);
old_target = update_pointer_focus_state (toplevel, event, target);
if (event->type == GDK_MOTION_NOTIFY || event->type == GDK_ENTER_NOTIFY)
update_cursor (toplevel, device, target);
gtk_window_maybe_update_cursor (toplevel, target, device);
if (event->type == GDK_TOUCH_BEGIN)
gtk_window_set_pointer_focus_grab (toplevel, device, sequence, target);