AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 22:41:43 +00:00
Code Issues Projects Releases Wiki Activity

window: Clear resize_cursor on leave notify events

Browse Source 
When the pointer leaves the window surface, gtk_window_capture_motion
will not be called anymore, so priv->resize_cursor may remain non-NULL
indefinitely without this.

If update_cursor is later called (via gtk_window_maybe_update_cursor) on
a virtual enter notify event (e.g. because the pointer entered a
descendant surface), it would previously re-set the window surface
cursor to priv->resize_cursor, which could result in the wrong cursor
shape being shown for descendant surfaces.

This affected mutter-x11-frames, see
https://gitlab.freedesktop.org/xorg/xserver/-/issues/1557.

One could also say that if the pointer leaves the window surface, it's
trivially not over any window edge.
This commit is contained in:
Michel Dänzer 2023-06-12 18:28:29 +02:00 committed by Carlos Garnacho
parent deac44962a
commit f8fd04402e
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtkwindow.c
View File

@ -1576,6 +1576,15 @@ gtk_window_capture_motion (GtkWidget *widget,
gtk_window_maybe_update_cursor (window, widget, NULL);
}
static void
gtk_window_capture_leave (GtkWidget *widget)
{
GtkWindow *window = GTK_WINDOW (widget);
GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
g_clear_object (&priv->resize_cursor);
}
static void
gtk_window_activate_default_activate (GtkWidget *widget,
const char *name,
@ -1680,6 +1689,8 @@ gtk_window_init (GtkWindow *window)
GTK_PHASE_CAPTURE);
g_signal_connect_swapped (controller, "motion",
G_CALLBACK (gtk_window_capture_motion), window);
g_signal_connect_swapped (controller, "leave",
G_CALLBACK (gtk_window_capture_leave), window);
gtk_widget_add_controller (widget, controller);
controller = gtk_event_controller_key_new ();