diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2016-04-26 15:31:33 +0800 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2016-05-05 15:03:59 -0400 |
| commit | 0258c88949a17a0dd5ae93dcec3ba1bc62839577 (patch) | |
| tree | 7fa40c522b6f40da544df26458ce5bdc23c41b84 /gdk/wayland/gdkdevice-wayland.c | |
| parent | 3244d7a138a85ac4f7fb809340f4c86b43b303f5 (diff) | |
| download | gtk+-0258c88949a17a0dd5ae93dcec3ba1bc62839577.tar.gz | |
gdk/dnd: Don't use default display when getting cursor
Always associate a drag context with a GdkDisplay and use that when
getting a cursor for a given action.
If we don't do this, dragging on a window that doesn't use the default
display will make us use cursors from the wrong display.
https://bugzilla.gnome.org/show_bug.cgi?id=765565
Diffstat (limited to 'gdk/wayland/gdkdevice-wayland.c')
| -rw-r--r-- | gdk/wayland/gdkdevice-wayland.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c index db2a695891..dfe62d79e8 100644 --- a/gdk/wayland/gdkdevice-wayland.c +++ b/gdk/wayland/gdkdevice-wayland.c @@ -2983,7 +2983,8 @@ _gdk_wayland_device_manager_add_seat (GdkDeviceManager *device_manager, seat->data_device = wl_data_device_manager_get_data_device (display_wayland->data_device_manager, seat->wl_seat); - seat->drop_context = _gdk_wayland_drop_context_new (seat->data_device); + seat->drop_context = _gdk_wayland_drop_context_new (display, + seat->data_device); wl_data_device_add_listener (seat->data_device, &data_device_listener, seat); |