[gtk/wip/coreyberla/dnd-x11: 1/2] gdkdrop-x11: Only update actions in position_filter for non-local drops




commit 48d84708abfc0bd9be6de1139ed5d43e42438c2f
Author: Corey Berla <corey berla me>
Date:   Thu Aug 25 15:38:22 2022 -0700

    gdkdrop-x11: Only update actions in position_filter for non-local drops
    
    It doesn't make sense to update the gdk drop action here because
    it would choose the "default" action (first in bitwise order)
    for local drags, so check if it's a non-local drag first

 gdk/x11/gdkdrop-x11.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/gdk/x11/gdkdrop-x11.c b/gdk/x11/gdkdrop-x11.c
index 05b07ca990..8f2c718f3c 100644
--- a/gdk/x11/gdkdrop-x11.c
+++ b/gdk/x11/gdkdrop-x11.c
@@ -655,7 +655,8 @@ xdnd_position_filter (GdkSurface   *surface,
       impl = GDK_X11_SURFACE (surface);
 
       drop_x11->suggested_action = xdnd_action_from_atom (display, action);
-      gdk_x11_drop_update_actions (drop_x11);
+      if (!gdk_drop_get_drag (drop))
+        gdk_x11_drop_update_actions (drop_x11);
 
       drop_x11->last_x = x_root / impl->surface_scale;
       drop_x11->last_y = y_root / impl->surface_scale;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]