diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-01 15:39:08 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-01 15:39:08 +0000 |
| commit | 75a297632eef3de56990f1a702a8d496057f0575 (patch) | |
| tree | b0e4bede8566b665171784a109accab945a94f8d | |
| parent | b5938faa06f714c5ef2316c39d0743850b056705 (diff) | |
| parent | d888402bf9eed48a5b0c8c2f5dc91b1edcd7897d (diff) | |
| download | gtk+-75a297632eef3de56990f1a702a8d496057f0575.tar.gz | |
Merge branch 'wip/chergert/fix-macos-window-check' into 'master'
macos: ensure GdkMacosWindow in surface discovery
Closes #3533
See merge request GNOME/gtk!3021
| -rw-r--r-- | gdk/macos/gdkmacosdisplay-translate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdk/macos/gdkmacosdisplay-translate.c b/gdk/macos/gdkmacosdisplay-translate.c index 5f5eeffdcf..b638b87ab9 100644 --- a/gdk/macos/gdkmacosdisplay-translate.c +++ b/gdk/macos/gdkmacosdisplay-translate.c @@ -762,7 +762,7 @@ get_surface_from_ns_event (GdkMacosDisplay *self, GdkSurface *surface = NULL; NSWindow *nswindow = [nsevent window]; - if (nswindow) + if (GDK_IS_MACOS_WINDOW (nswindow)) { GdkMacosBaseView *view; NSPoint point, view_point; @@ -974,11 +974,11 @@ find_surface_for_ns_event (GdkMacosDisplay *self, g_assert (x != NULL); g_assert (y != NULL); - view = (GdkMacosBaseView *)[[nsevent window] contentView]; - if (!(surface = get_surface_from_ns_event (self, nsevent, &point, x, y))) return NULL; + view = (GdkMacosBaseView *)[GDK_MACOS_SURFACE (surface)->window contentView]; + _gdk_macos_display_from_display_coords (self, point.x, point.y, &x_tmp, &y_tmp); switch ((int)[nsevent type]) |