diff options
| author | Jonas Ådahl <jadahl@gmail.com> | 2016-04-26 15:31:33 +0800 |
|---|---|---|
| committer | Jonas Ådahl <jadahl@gmail.com> | 2016-04-26 23:03:24 +0800 |
| commit | 1a4f000f3b2a3289c6bcd30b7ce259c1686ef169 (patch) | |
| tree | c53c46c41b69be65b39738605a8d74ae096f72e9 /gdk/quartz/GdkQuartzNSWindow.c | |
| parent | f27dd214267b5b907411cefb85350acfbb26ac77 (diff) | |
| download | gtk+-1a4f000f3b2a3289c6bcd30b7ce259c1686ef169.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/quartz/GdkQuartzNSWindow.c')
| -rw-r--r-- | gdk/quartz/GdkQuartzNSWindow.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gdk/quartz/GdkQuartzNSWindow.c b/gdk/quartz/GdkQuartzNSWindow.c index e45c632aa8..5a99411c6e 100644 --- a/gdk/quartz/GdkQuartzNSWindow.c +++ b/gdk/quartz/GdkQuartzNSWindow.c @@ -587,6 +587,8 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender) window = [[self contentView] gdkWindow]; + current_context->display = gdk_window_get_display (window); + device_manager = gdk_display_get_device_manager (gdk_display_get_default ()); gdk_drag_context_set_device (current_context, gdk_device_manager_get_client_pointer (device_manager)); |