From 1f2d3c0900672523b51e26698aead58d86e27a6f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 4 May 2019 16:21:33 +0000
Subject: [PATCH] window: Don't inherit cursors across surfaces

I can't think of a case where this is the desired
behavior. So, instead of setting an explicit cursor
on all popups, just stop walking the parents at
surface boundaries.
---
 gtk/gtkwindow.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index ca8d34e053..af33165a5a 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -9923,6 +9923,10 @@ update_cursor (GtkWindow *toplevel,
           if (grab_widget && target == grab_widget)
             break;
 
+          /* Don't inherit cursors across surfaces */
+          if (surface != gtk_widget_get_surface (target))
+            break;
+
           cursor = gtk_widget_get_cursor (target);
 
           if (cursor)