AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

window: Don't get surfaces needlessly

Browse Source 
There is a 1-1 correspondence between natives and
surfaces, so we can just compare the natives, no
need to get the surface for every single one.
This commit is contained in:
Matthias Clasen 2020-09-27 08:57:05 -04:00
parent d2f0e3fa6b
commit 68bb532290
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkwindow.c
View File

@ -7015,16 +7015,18 @@ update_cursor (GtkWindow *toplevel,
{
GtkWindowPrivate *priv = gtk_window_get_instance_private (toplevel);
GdkCursor *cursor = NULL;
GtkNative *native;
GdkSurface *surface;
surface = gtk_native_get_surface (gtk_widget_get_native (target));
native = gtk_widget_get_native (target);
surface = gtk_native_get_surface (native);
if (grab_widget && !gtk_widget_is_ancestor (target, grab_widget) && target != grab_widget)
{
/* Outside the grab widget, cursor stays to whatever the grab
* widget says.
*/
if (gtk_native_get_surface (gtk_widget_get_native (grab_widget)) == surface)
if (gtk_widget_get_native (grab_widget) == native)
cursor = gtk_widget_get_cursor (grab_widget);
else
cursor = NULL;
@ -7037,7 +7039,7 @@ update_cursor (GtkWindow *toplevel,
while (target)
{
/* Don't inherit cursors across surfaces */
if (surface != gtk_native_get_surface (gtk_widget_get_native (target)))
if (native != gtk_widget_get_native (target))
break;
if (target == GTK_WIDGET (toplevel) && priv->resize_cursor != NULL)