wayland: Fix action handling more
authorMatthias Clasen <mclasen@redhat.com>
Sat, 4 Jan 2020 14:16:26 +0000 (09:16 -0500)
committerMatthias Clasen <mclasen@redhat.com>
Sat, 4 Jan 2020 14:38:31 +0000 (09:38 -0500)
When updating GdkDrop::actions from changes sent by
the compositor, we were inadvertently setting them to 0,
causing drops to appear impossible.

gdk/wayland/gdkdrop-wayland.c

index 3e0a25deaa37149f2a3e2691d7c2a2d4260ee86f..686157fd813a7f158cc25f5909f58c86fe24b53e 100644 (file)
@@ -288,7 +288,8 @@ gdk_wayland_drop_update_actions (GdkWaylandDrop *drop)
   GdkDragAction gdk_actions = 0;
   uint32_t wl_actions;
 
-  if (drop->action & WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK)
+  if (drop->action == 0 ||
+      drop->action & WL_DATA_DEVICE_MANAGER_DND_ACTION_ASK)
     wl_actions = drop->source_actions;
   else
     wl_actions = drop->action;